From 5df2a2943d280832af05f1d3e9c30976470a6e6a Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Mon, 14 Oct 2019 15:33:07 +0200 Subject: Fix building against Qt6 Use the versionAtLeast() function in qmake instead of a manual version comparison. Change-Id: I768fb0495b1480616f2f371488ca2547c7e8ab55 Reviewed-by: Robert Griebl --- qtivi.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qtivi.pro b/qtivi.pro index 417dfbd..e746236 100644 --- a/qtivi.pro +++ b/qtivi.pro @@ -15,8 +15,7 @@ enable-tests { QML_IMPORT_PATH = $$shadowed($$PWD)/qml -MIN_MINOR = 12 # b/c we need the new Qt configuration system -!equals(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, $$MIN_MINOR):error("QtIvi needs to be built against Qt 5.$${MIN_MINOR}+") +!versionAtLeast(QT_VERSION, 5.12.0): error("QtIvi needs to be built against Qt 5.$${MIN_MINOR}+") load(qt_parts) -- cgit v1.2.3