summaryrefslogtreecommitdiffstats
path: root/patches/source/qt/qt.webkit-no_Werror.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/source/qt/qt.webkit-no_Werror.patch')
-rw-r--r--patches/source/qt/qt.webkit-no_Werror.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/patches/source/qt/qt.webkit-no_Werror.patch b/patches/source/qt/qt.webkit-no_Werror.patch
new file mode 100644
index 00000000..c8d730e4
--- /dev/null
+++ b/patches/source/qt/qt.webkit-no_Werror.patch
@@ -0,0 +1,11 @@
+--- 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):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).