diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 06:39:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:57:12 +0200 |
| commit | 657c2bfbeceda3faa2c7a76b4ccec6a65a3445a2 (patch) | |
| tree | 83e0a1dab04afb291e181bb8fb6152ba96678795 /mkspecs/features/qt_common.prf | |
| parent | 676129d7ee57347798683d444823e7723776d8ec (diff) | |
| parent | b94111116f09a6e48741d35cf7abea47af99ef26 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/testlib/selftests/generate_expected_output.py
Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7
Diffstat (limited to 'mkspecs/features/qt_common.prf')
| -rw-r--r-- | mkspecs/features/qt_common.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index d94fb4a1c2..59e08fc124 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -67,12 +67,12 @@ warnings_are_errors:warning_clean { # If the module declares that it has does its clean-up of warnings, enable -Werror. # This setting is compiler-dependent anyway because it depends on the version of the # compiler. - clang:!ios { - # Apple clang 4.0-4.2,5.0-5.1,6.0-6.4 + clang { + # Apple clang 4.0-4.2,5.0-5.1,6.0-6.4,7.0-7.3 # Regular clang 3.3-3.9 apple_ver = $${QT_APPLE_CLANG_MAJOR_VERSION}.$${QT_APPLE_CLANG_MINOR_VERSION} reg_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} - contains(apple_ver, "4\\.[012]|5\\.[01]|6\\.[01234]")|contains(reg_ver, "3\\.[3-9]") { + contains(apple_ver, "4\\.[012]|5\\.[01]|6\\.[01234]|7\\.[0123]")|contains(reg_ver, "3\\.[3-9]") { QMAKE_CXXFLAGS_WARN_ON += -Werror -Wno-error=\\$${LITERAL_HASH}warnings -Wno-error=deprecated-declarations $$WERROR } } else:intel_icc:linux { |