blob: 92ad94424a74d6e82cfcf323f7cf1d2d81c24598 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
Index: qtwebkit/Source/WebKit.pri
===================================================================
--- qtwebkit.orig/Source/WebKit.pri 2013-12-10 19:58:34.964073035 +0400
+++ qtwebkit/Source/WebKit.pri 2013-12-12 14:47:56.394704704 +0400
@@ -115,7 +115,9 @@
# Treat warnings as errors on x86/Linux/GCC
linux-g++*|glibc-*|hurd-* {
isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -Wno-error=unused-local-typedefs
+}
+*-g++* {
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).
|
