diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-06-17 14:04:27 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-06-24 14:44:24 +0200 |
| commit | d393395518e38c686c654c2d9100b8d441645021 (patch) | |
| tree | 5d48b9118bd79d1eec2b2cf3f8c86653effc7c9e | |
| parent | 24a7ea9a99ac0778cf8b85d136ae49efef504c19 (diff) | |
| download | qtwebkit-d393395518e38c686c654c2d9100b8d441645021.tar.gz | |
Fix build with gcc 4.4
Gcc 4.4 does not have the unused-but-set-variable warning flag and
fails when building leveldb which tries to set it.
This patch only sets it on gcc versions that supports it.
Change-Id: Iea4fb5bab062729fc0518d644122f13502967cfb
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Source/ThirdParty/leveldb/Target.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/ThirdParty/leveldb/Target.pri b/Source/ThirdParty/leveldb/Target.pri index abfde15eb..e071b6d5c 100644 --- a/Source/ThirdParty/leveldb/Target.pri +++ b/Source/ThirdParty/leveldb/Target.pri @@ -109,8 +109,10 @@ linux: DEFINES += OS_LINUX freebsd*: DEFINES += OS_FREEBSD gcc { - QMAKE_CXXFLAGS_WARN_ON += -Wno-error=unused-but-set-variable - QMAKE_CXXFLAGS += -Wno-error=unused-but-set-variable + 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 + } } QT += core |