diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-09-17 14:12:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-09-18 16:28:43 +0200 |
| commit | ab437e2fa0b15ef2b15456e4bafe3127b5ea227d (patch) | |
| tree | f85849d1abc542be5bcbf3049409f09570fc1852 | |
| parent | 50e7c5f5d731e9661cff5562e581d250722a0092 (diff) | |
| download | qtwebkit-ab437e2fa0b15ef2b15456e4bafe3127b5ea227d.tar.gz | |
Use compiling_thirdparty_code instead of disabling specific warnings
Instead of disabling all the extra warnings that appear in third-party
libraries we should just use the already existing build config to
avoid adding all the extra WebKit warning flags when building those
libraries.
Change-Id: I809b7f51a992f0314e2f5983008bc3b4b580c68e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Source/ThirdParty/ANGLE/Target.pri | 4 | ||||
| -rw-r--r-- | Source/ThirdParty/leveldb/Target.pri | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/Source/ThirdParty/ANGLE/Target.pri b/Source/ThirdParty/ANGLE/Target.pri index 52fef9e61..dc08a1550 100644 --- a/Source/ThirdParty/ANGLE/Target.pri +++ b/Source/ThirdParty/ANGLE/Target.pri @@ -147,9 +147,7 @@ else: SOURCES += src/compiler/ossource_posix.cpp # Make sure the derived sources are built include(DerivedSources.pri) -*g++* { - QMAKE_CXXFLAGS += -Wno-unused-variable -Wno-missing-noreturn -Wno-unused-function -Wno-reorder -Wno-error -Wno-unknown-pragmas -Wno-undef -} +CONFIG += compiling_thirdparty_code # We do not need anything from Qt QT = diff --git a/Source/ThirdParty/leveldb/Target.pri b/Source/ThirdParty/leveldb/Target.pri index e071b6d5c..6ea57d97c 100644 --- a/Source/ThirdParty/leveldb/Target.pri +++ b/Source/ThirdParty/leveldb/Target.pri @@ -108,11 +108,6 @@ mac: DEFINES += OS_MACOSX linux: DEFINES += OS_LINUX freebsd*: DEFINES += OS_FREEBSD -gcc { - greaterThan(QT_GCC_MAJOR_VERSION, 4)|greaterThan(QT_GCC_MINOR_VERSION, 5) { - QMAKE_CXXFLAGS_WARN_ON += -Wno-error=unused-but-set-variable - QMAKE_CXXFLAGS += -Wno-error=unused-but-set-variable - } -} +CONFIG += compiling_thirdparty_code QT += core |