From fcfb67bf242ae9db81588cfe0495bb9785bd1546 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Wed, 28 Aug 2019 12:00:58 +0200 Subject: 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 --- config.tests/compiletest/compiletest.pro | 7 +++++-- 1 file 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 } -- cgit v1.2.3