2013-11-04 18:08:47 +01:00
|
|
|
--- qt-everywhere-opensource-src-4.8.4/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-12-02 15:59:44.891550783 +0100
|
|
|
|
+++ qt-everywhere-opensource-src-4.8.4/src/3rdparty/webkit/Source/WebKit.pri 2012-12-02 16:52:47.384406539 +0100
|
|
|
|
@@ -102,8 +102,6 @@
|
2012-09-26 03:10:42 +02:00
|
|
|
|
|
|
|
# Treat warnings as errors on x86/Linux/GCC
|
|
|
|
linux-g++* {
|
2013-11-04 18:08:47 +01:00
|
|
|
- !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
|
2012-09-26 03:10:42 +02:00
|
|
|
-
|
|
|
|
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).
|