From 31eada8ecaabb1a969f315fe46d35971f61c6e83 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 6 Aug 2019 16:26:27 +0200 Subject: Fix Qt6 build Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: Ia363f9e36afbee734c1991916bbdd48fbd20e989 Reviewed-by: Simon Hausmann --- src/imports/location/location.cpp | 5 +++-- src/imports/positioning/positioning.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index fccb628d..b7f78658 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -204,8 +204,9 @@ public: minor = 14; qmlRegisterType(uri, major, minor, "Map"); - // Register the latest Qt version as QML type version - qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 5, 15); //registrations below are version independent qRegisterMetaType(); diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 38b9378a..27098a85 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -619,8 +619,9 @@ public: minor = 14; qmlRegisterType(uri, major, minor, "PluginParameter"); - // Register the latest Qt version as QML type version - qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR); + // The minor version used to be the current Qt 5 minor. For compatibility it is the last + // Qt 5 release. + qmlRegisterModule(uri, 5, 15); } else { qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri); } -- cgit v1.2.1