Title: [118763] trunk/Tools
- Revision
- 118763
- Author
- ves...@webkit.org
- Date
- 2012-05-29 06:21:43 -0700 (Tue, 29 May 2012)
Log Message
[Qt] Don't add cxx-flags to QMAKE_CFLAGS
Prevents warnings such as: "command line option ‘-Wno-c++0x-compat’ is
valid for C++/ObjC++ but not for C [enabled by default]"
Reviewed by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (118762 => 118763)
--- trunk/Tools/ChangeLog 2012-05-29 13:17:23 UTC (rev 118762)
+++ trunk/Tools/ChangeLog 2012-05-29 13:21:43 UTC (rev 118763)
@@ -1,5 +1,16 @@
2012-05-29 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Don't add cxx-flags to QMAKE_CFLAGS
+
+ Prevents warnings such as: "command line option ‘-Wno-c++0x-compat’ is
+ valid for C++/ObjC++ but not for C [enabled by default]"
+
+ Reviewed by Simon Hausmann.
+
+ * qmake/mkspecs/features/unix/default_post.prf:
+
+2012-05-29 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Sync up favicon-implementation with WebView url changes in r118158
https://bugs.webkit.org/show_bug.cgi?id=87133
Modified: trunk/Tools/qmake/mkspecs/features/unix/default_post.prf (118762 => 118763)
--- trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-05-29 13:17:23 UTC (rev 118762)
+++ trunk/Tools/qmake/mkspecs/features/unix/default_post.prf 2012-05-29 13:21:43 UTC (rev 118763)
@@ -18,9 +18,7 @@
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_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
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
