13 lines
908 B
Diff
13 lines
908 B
Diff
|
diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri
|
||
|
|
--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100
|
||
|
|
+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200
|
||
|
|
@@ -102,8 +102,6 @@ CONFIG -= warn_on
|
||
|
|
|
||
|
|
# Treat warnings as errors on x86/Linux/GCC
|
||
|
|
linux-g++* {
|
||
|
|
- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
|
||
|
|
-
|
||
|
|
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).
|