From c147b20a2c1299b2d659fe7c9472ae3866b6a425 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 12 Jul 2019 22:04:01 +0200 Subject: Fix module imports when building with Qt Version 6.0.0 For modules such as QtQuick we register 2.$QT_VERSION_MINOR to allow our users to simply use the latest "Qt version" with their imports. When switching to version 6.0.0, code that used import QtQuick 5.13 would stop working because we had some types registered to say minor version 10 but nothing after that, and the qmlRegisterModule() call would use QT_VERSION_MINOR, which is now zero. Therefore in this Qt 6 branch, let's stick to the latest Qt 5 release planned, to maintain compatibility. Change-Id: I174be32cef8de152cd32010156ae716bd474397c Reviewed-by: Ulf Hermann Reviewed-by: Fabian Kosmale --- src/imports/window/plugin.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/imports/window') diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp index dfe1dcf62e..a331708e87 100644 --- a/src/imports/window/plugin.cpp +++ b/src/imports/window/plugin.cpp @@ -71,8 +71,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Window")); QQuickWindowModule::defineModule(); - // Auto-increment the import to stay in sync with ALL future QtQuick minor versions from 5.11 onward - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); + qmlRegisterModule(uri, 2, 15); } }; //![class decl] -- cgit v1.2.3