Commit 1385c98c authored by vestbo@webkit.org's avatar vestbo@webkit.org

[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@118763 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent db81375b
2012-05-29 Tor Arne Vestbø <tor.arne.vestbo@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.vestbo@nokia.com>
[Qt] Sync up favicon-implementation with WebView url changes in r118158
......
......@@ -18,9 +18,7 @@ linux-g++* {
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
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment