Title: [118769] trunk/Source/WTF
- Revision
- 118769
- Author
- [email protected]
- Date
- 2012-05-29 06:53:04 -0700 (Tue, 29 May 2012)
Log Message
[Qt] Remove duplication of logic for disabling selected warnings related to C++11
This is already handled in unix/default_post.prf
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (118768 => 118769)
--- trunk/Source/WTF/ChangeLog 2012-05-29 13:41:08 UTC (rev 118768)
+++ trunk/Source/WTF/ChangeLog 2012-05-29 13:53:04 UTC (rev 118769)
@@ -1,3 +1,13 @@
+2012-05-29 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Remove duplication of logic for disabling selected warnings related to C++11
+
+ This is already handled in unix/default_post.prf
+
+ Reviewed by Simon Hausmann.
+
+ * WTF.pro:
+
2012-05-27 Darin Adler <[email protected]>
Fix an incorrect assertion in Vector::remove
Modified: trunk/Source/WTF/WTF.pro (118768 => 118769)
--- trunk/Source/WTF/WTF.pro 2012-05-29 13:41:08 UTC (rev 118768)
+++ trunk/Source/WTF/WTF.pro 2012-05-29 13:53:04 UTC (rev 118769)
@@ -240,22 +240,8 @@
QMAKE_CFLAGS += -mieee -w
}
-lessThan(QT_GCC_MAJOR_VERSION, 5) {
- # GCC 4.5 and before
- lessThan(QT_GCC_MINOR_VERSION, 6) {
- # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
- *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
- }
-
- # GCC 4.6 and after.
- greaterThan(QT_GCC_MINOR_VERSION, 5) {
- if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
- # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
- QMAKE_CFLAGS_WARN_ON += -Wno-c++0x-compat
- QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat
- QMAKE_CFLAGS += -Wno-c++0x-compat
- QMAKE_CXXFLAGS += -Wno-c++0x-compat
- }
- }
+*-g++*:lessThan(QT_GCC_MAJOR_VERSION, 5):lessThan(QT_GCC_MINOR_VERSION, 6) {
+ # For GCC 4.5 and before we disable C++0x mode in JSC for if enabled in Qt's mkspec
+ QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x -std=c++11 -std=gnu++11
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
