diff options
Diffstat (limited to 'src/3rdparty/webkit/Source/WebKit.pri')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri index 007fb44..127b6ee 100644 --- a/src/3rdparty/webkit/Source/WebKit.pri +++ b/src/3rdparty/webkit/Source/WebKit.pri @@ -97,6 +97,8 @@ linux-g++* { greaterThan(QT_GCC_MAJOR_VERSION, 3):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 } |