summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuís Pereira <luis.artur.pereira@gmail.com>2014-07-23 15:45:50 -0700
committerDavid Faure <david.faure@kdab.com>2014-07-24 09:43:50 +0200
commita0820aef5a180debef365247dc98dcf06b3c7356 (patch)
treec0ab38c9c0ad69f931cf33d8e88d0de610713b21
parentca4ffbdb294530db1139f261a02f8f560e2e060b (diff)
Support building against Qt v4.7.2 using "modern" GCC versions
With "modern" GCC versions we got some new warnings that, due to the -Werror, were treated as errors. Just kill the -Werror flag. Change-Id: I3947fde8b56dab8f3810366aa27dc25967ba5b10 Reviewed-by: David Faure <david.faure@kdab.com>
-rw-r--r--src/mimetypes/mimetypes.pro2
-rw-r--r--tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro2
-rw-r--r--tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro2
-rw-r--r--tests/auto/qmimetype/qmimetype.pro2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/mimetypes/mimetypes.pro b/src/mimetypes/mimetypes.pro
index 1f33754..b0c22c5 100644
--- a/src/mimetypes/mimetypes.pro
+++ b/src/mimetypes/mimetypes.pro
@@ -25,7 +25,7 @@ unix {
QT = core
-QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wshadow -Wno-long-long -Wnon-virtual-dtor
+QMAKE_CXXFLAGS += -W -Wall -Wextra -Wshadow -Wno-long-long -Wnon-virtual-dtor
SOURCES += qmimedatabase.cpp \
qmimetype.cpp \
diff --git a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
index 5fb02d3..f0499ef 100644
--- a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
+++ b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
@@ -25,4 +25,4 @@ check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/m
DEFINES += CORE_SOURCES='"\\"$$PWD/../../../../src\\""'
-*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wno-long-long -Wnon-virtual-dtor
+*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Wno-long-long -Wnon-virtual-dtor
diff --git a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
index 2ffde9c..b1ec4ff 100644
--- a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
+++ b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
@@ -25,4 +25,4 @@ check.commands = LD_LIBRARY_PATH=$$(LD_LIBRARY_PATH):$$OUT_PWD/../../../../src/m
DEFINES += CORE_SOURCES='"\\"$$PWD/../../../../src\\""'
-*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wno-long-long -Wnon-virtual-dtor
+*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Wno-long-long -Wnon-virtual-dtor
diff --git a/tests/auto/qmimetype/qmimetype.pro b/tests/auto/qmimetype/qmimetype.pro
index 4039e4d..02e7db2 100644
--- a/tests/auto/qmimetype/qmimetype.pro
+++ b/tests/auto/qmimetype/qmimetype.pro
@@ -9,7 +9,7 @@ CONFIG -= app_bundle
DEPENDPATH += .
-*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wshadow -Wno-long-long -Wnon-virtual-dtor
+*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wshadow -Wno-long-long -Wnon-virtual-dtor
CONFIG += depend_includepath