summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-03 03:02:18 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-03 03:02:23 +0200
commit6c09f44f6395a7d18dc35cfc0e408e61f4db2cf5 (patch)
tree50ff343fd61c01781ef89682e63b86607d0571cb
parent827ad07634291c17eac9741140ffc48dd5db79b4 (diff)
parent5f242c5fc560084d6abcb335cb2532c32fda099a (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
-rw-r--r--config.tests/compiletest/compiletest.pro7
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
}