From b918cfcf748bcd4fb803a94925e4e58edcceba21 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Wed, 30 Jan 2019 14:48:04 +0100 Subject: Remove legacy qmake 5.9 support function Change-Id: I5b642f4ea612266aacb9715ff82c6e2c4462c599 Reviewed-by: Dominik Holland --- .qmake.conf | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index 55f43bf2..ba10eefc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -10,28 +10,3 @@ QMAKEFEATURES=$$SOURCE_DIR/qmake-features # This makes sure we compile everything with coverage data # when the coverage target gets executed !win32: CONFIG += am-coverage - -# Qt 5.9 is still missing this function, so we inject it here -# TODO: remove this once 5.9 is not relevant anymore -!defined(versionAtLeast, test): { - defineTest(versionAtLeast) { - LEFT_VERSION = $$eval($$1) - LEFT_VERSION_MAJOR = $$section(LEFT_VERSION, ., 0, 0) - LEFT_VERSION_MINOR = $$section(LEFT_VERSION, ., 1, 1) - LEFT_VERSION_PATCH = $$section(LEFT_VERSION, ., 2, 2) - - RIGHT_VERSION = $$2 - RIGHT_VERSION_MAJOR = $$section(RIGHT_VERSION, ., 0, 0) - RIGHT_VERSION_MINOR = $$section(RIGHT_VERSION, ., 1, 1) - RIGHT_VERSION_PATCH = $$section(RIGHT_VERSION, ., 2, 2) - - greaterThan(LEFT_VERSION_MAJOR, $$RIGHT_VERSION_MAJOR) { - return(true) - } else:equals(LEFT_VERSION_MAJOR, $$RIGHT_VERSION_MAJOR):greaterThan(LEFT_VERSION_MINOR, $$RIGHT_VERSION_MINOR) { - return(true) - } else:equals(LEFT_VERSION_MAJOR, $$RIGHT_VERSION_MAJOR):equals(LEFT_VERSION_MINOR, $$RIGHT_VERSION_MINOR):!lessThan(LEFT_VERSION_PATCH, $$RIGHT_VERSION_PATCH) { - return(true) - } - return(false) - } -} -- cgit v1.2.3