diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-03-21 10:40:11 +0300 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-08-02 21:08:07 +0000 |
commit | bf6ae8406bc714828c7746f6abd611b66bbeb363 (patch) | |
tree | 61b3bd11152f8d5af2620a2ba0d008f6b9f2c475 /mkspecs/features/qt_common.prf | |
parent | 6b38758084a10e210aed5a22110717ccc29ec5f8 (diff) |
Compare versions in qmake files with versionAtLeast
Change-Id: Iba5686131d9f3e22e9a4d6da473a61a845b0418e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features/qt_common.prf')
-rw-r--r-- | mkspecs/features/qt_common.prf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index e66c24b027..65574d2635 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -55,9 +55,8 @@ host_build:cross_compile: return() # -Wdate-time: warn if we use __DATE__ or __TIME__ (we want to be able to reproduce the exact same binary) # -Wvla: use of variable-length arrays (an extension to C++) clang { - # Clang 3.5 introduced -Wdate-time - # The conditional assumes we aren't compiling against Clang 2.x anymore - greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 4): \ + clang_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} + versionAtLeast(clang_ver, 3.5): \ QMAKE_CXXFLAGS_WARN_ON += -Wdate-time } else: gcc:!intel_icc { QMAKE_CXXFLAGS_WARN_ON += -Wvla |