diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-11-29 16:44:09 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-11-29 15:44:49 +0000 |
| commit | 306d682b695b044c396bb6b2f29ae9522c0c8e1e (patch) | |
| tree | 86b63701ac00f223d8fad2a201ce4a8a3b5da178 /.qmake.conf | |
| parent | 93819dae06121a73a8dd4df284b1a7bd7ebd4f0f (diff) | |
dev is 5.13 now
Change-Id: I4bedb8bb3a787c0fc109b0997ea7e98b0fe32def
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/.qmake.conf b/.qmake.conf index c37242ef..b2e906fe 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,6 @@ load(qt_build_config) -MODULE_VERSION = 5.12.0 +MODULE_VERSION = 5.13.0 SOURCE_DIR=$$PWD BUILD_DIR=$$shadowed($$PWD) @@ -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) - } -} |