diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-08-28 12:00:58 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-08-28 15:31:29 +0200 |
commit | fcfb67bf242ae9db81588cfe0495bb9785bd1546 (patch) | |
tree | 46507b86e454f771c0f91630736784babacdcbfc | |
parent | 7e0c7ab520bcc161685c86a6a76b223a75674898 (diff) |
Revert "Fix gcc version check"
This reverts commit ee2f01020005b1baa63de918be1dc75ae581f7b1.
A parent commit introduced a compilation fix that makes this
patchset superfluous. Enables the SLES12 target.
Change-Id: I8028104cf5fafb23bf3dea3c551659f807d65044
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r-- | config.tests/compiletest/compiletest.pro | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config.tests/compiletest/compiletest.pro b/config.tests/compiletest/compiletest.pro index 66f8581..b4d29a1 100644 --- a/config.tests/compiletest/compiletest.pro +++ b/config.tests/compiletest/compiletest.pro @@ -1,5 +1,8 @@ - gcc:!clang:lessThan(QT_GCC_MAJOR_VERSION, 5) { - SOURCES += main_less_5.cpp +gcc { + versionAtLeast(QT_GCC_MAJOR_VERSION, 5) \ + SOURCES += main.cpp + else: \ + SOURCES += main_less_5.cpp } else { SOURCES += main.cpp } |