[packages/qt4.git] / webkit-no_Werror.patch

--- qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.orig	2012-09-16 10:19:19.460207413 +0200
+++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri	2012-09-16 10:20:36.650205806 +0200
@@ -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).
Commit	Line	Data
297dfe59 JB	1	--- qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri.orig 2012-09-16 10:19:19.460207413 +0200
	2	+++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/webkit/Source/WebKit.pri 2012-09-16 10:20:36.650205806 +0200
	3	@@ -102,8 +102,6 @@
a94cef47 JR	4
	5	# Treat warnings as errors on x86/Linux/GCC
	6	linux-g++* {
297dfe59	7	- !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)\|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
a94cef47 JR	8	-
	9	greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
	10	if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
	11	# We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).