Title: [153520] trunk
- Revision
- 153520
- Author
- [email protected]
- Date
- 2013-07-31 06:09:38 -0700 (Wed, 31 Jul 2013)
Log Message
[Qt] Build WebKit with C++11
https://bugs.webkit.org/show_bug.cgi?id=119337
Reviewed by Csaba Osztrogonác.
Source/WebKit2:
We no longer need to enable C++11 specifically for WebKit2.
* WebKit2.pri:
Tools:
Enable building with C++11.
* qmake/mkspecs/features/default_pre.prf:
* qmake/mkspecs/features/unix/default_post.prf:
* qmake/mkspecs/features/unix/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (153519 => 153520)
--- trunk/Source/WebKit2/ChangeLog 2013-07-31 12:49:46 UTC (rev 153519)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-31 13:09:38 UTC (rev 153520)
@@ -1,3 +1,14 @@
+2013-07-31 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Build WebKit with C++11
+ https://bugs.webkit.org/show_bug.cgi?id=119337
+
+ Reviewed by Csaba Osztrogonác.
+
+ We no longer need to enable C++11 specifically for WebKit2.
+
+ * WebKit2.pri:
+
2013-07-30 Tim Horton <[email protected]>
DHTML drag can result in a null-deref under WebDragClient::startDrag
Modified: trunk/Source/WebKit2/WebKit2.pri (153519 => 153520)
--- trunk/Source/WebKit2/WebKit2.pri 2013-07-31 12:49:46 UTC (rev 153519)
+++ trunk/Source/WebKit2/WebKit2.pri 2013-07-31 13:09:38 UTC (rev 153520)
@@ -86,4 +86,3 @@
enable?(SECCOMP_FILTERS): PKGCONFIG += libseccomp
-CONFIG += c++11
Modified: trunk/Tools/ChangeLog (153519 => 153520)
--- trunk/Tools/ChangeLog 2013-07-31 12:49:46 UTC (rev 153519)
+++ trunk/Tools/ChangeLog 2013-07-31 13:09:38 UTC (rev 153520)
@@ -1,5 +1,18 @@
2013-07-31 Allan Sandfeld Jensen <[email protected]>
+ [Qt] Build WebKit with C++11
+ https://bugs.webkit.org/show_bug.cgi?id=119337
+
+ Reviewed by Csaba Osztrogonác.
+
+ Enable building with C++11.
+
+ * qmake/mkspecs/features/default_pre.prf:
+ * qmake/mkspecs/features/unix/default_post.prf:
+ * qmake/mkspecs/features/unix/default_pre.prf:
+
+2013-07-31 Allan Sandfeld Jensen <[email protected]>
+
[Qt] ASSERTS trigger in release builds
https://bugs.webkit.org/show_bug.cgi?id=119336
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (153519 => 153520)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2013-07-31 12:49:46 UTC (rev 153519)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2013-07-31 13:09:38 UTC (rev 153520)
@@ -97,6 +97,9 @@
contains(QT_CONFIG, build_all): CONFIG += build_all
}
+# WebKit depends on C++11 now.
+CONFIG += c++11
+
# A newer version of flex is required on Windows. At the moment the only
# one that appears to provide binaries and is not cygwin is winflex.
FLEX = flex
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (153519 => 153520)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-07-31 12:49:46 UTC (rev 153519)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2013-07-31 13:09:38 UTC (rev 153520)
@@ -21,21 +21,8 @@
# Treat warnings as errors on x86/Linux/GCC
isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
}
- greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
- !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) {
- # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
- QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
- QMAKE_CXXFLAGS += -Wno-c++0x-compat
- }
- }
}
-# Don't warn about OVERRIDE and FINAL, since they are feature-checked anyways
-*clang:!contains(QMAKE_CXXFLAGS, -std=c++11) {
- QMAKE_CXXFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
- QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
-}
-
contains(TEMPLATE, app): CONFIG += rpath
isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) {
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf (153519 => 153520)
--- trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2013-07-31 12:49:46 UTC (rev 153519)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_pre.prf 2013-07-31 13:09:38 UTC (rev 153520)
@@ -18,6 +18,5 @@
# Reduce linking memory pressure on 32-bit debug builds on Linux
linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files
-*clang: CONFIG += c++11
load(default_pre)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
