diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 22:04:01 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-15 09:31:13 +0200 |
| commit | c147b20a2c1299b2d659fe7c9472ae3866b6a425 (patch) | |
| tree | 02a2b7d5e45784aad57584ecce1d2e14ee633b35 /src/imports/window | |
| parent | 5844e6c734ba9a2c3a4d3b574f13847dbd334282 (diff) | |
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 <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports/window')
| -rw-r--r-- | src/imports/window/plugin.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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] |