summaryrefslogtreecommitdiff
path: root/source/l/qt/qt.webkit-no_Werror.patch
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/qt/qt.webkit-no_Werror.patch')
-rw-r--r--source/l/qt/qt.webkit-no_Werror.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/l/qt/qt.webkit-no_Werror.patch b/source/l/qt/qt.webkit-no_Werror.patch
index b8e718e0..c8d730e4 100644
--- a/source/l/qt/qt.webkit-no_Werror.patch
+++ b/source/l/qt/qt.webkit-no_Werror.patch
@@ -1,13 +1,11 @@
-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
+--- 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 @@
# 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
+- !CONFIG(standalone_package):if(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).
-