diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:02:18 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:02:18 +0200 |
| commit | 5f242c5fc560084d6abcb335cb2532c32fda099a (patch) | |
| tree | 50ff343fd61c01781ef89682e63b86607d0571cb | |
| parent | 827ad07634291c17eac9741140ffc48dd5db79b4 (diff) | |
| parent | 05f708f025018a96d3fa6c49ea0dc94f5131af23 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I7c4fc83b843f16c3d4044aef8180f54e75d9420d
| -rw-r--r-- | config.tests/compiletest/compiletest.pro | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config.tests/compiletest/compiletest.pro b/config.tests/compiletest/compiletest.pro index b4d29a1..66f8581 100644 --- a/config.tests/compiletest/compiletest.pro +++ b/config.tests/compiletest/compiletest.pro @@ -1,8 +1,5 @@ -gcc { - versionAtLeast(QT_GCC_MAJOR_VERSION, 5) \ - SOURCES += main.cpp - else: \ - SOURCES += main_less_5.cpp + gcc:!clang:lessThan(QT_GCC_MAJOR_VERSION, 5) { + SOURCES += main_less_5.cpp } else { SOURCES += main.cpp } |