blob: 268874b1989396b8de1926042aaad4b575e74bb2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
|
--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri.orig 2012-01-02 13:44:33.130841538 +0100
+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/WebKit.pri 2012-01-02 13:44:54.300511604 +0100
@@ -102,8 +102,6 @@
# Treat warnings as errors on x86/Linux/GCC
linux-g++* {
- 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).
|