diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:38:47 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:38:47 +0200 |
| commit | 14e03e58bff6196e78ce1eca0dac2b98fd82f9b9 (patch) | |
| tree | 3a6105bfa4969f4f0d13085542e3c24dde03f9c2 | |
| parent | 397d83275c7f5bf417e70bcbb5b66097dbf03083 (diff) | |
| parent | ee2f01020005b1baa63de918be1dc75ae581f7b1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ibf38b44cce020fb3b891c182e0246b43f58d20ff
| -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 } |