From a5792366f81fea6eb5ab3e301cd7abdfec0820c7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 12 Sep 2017 13:10:26 +0200 Subject: Fusion: fix type registration When the Qt version was bumped to 5.11, QtQuick.Controls.Fusion 2.3 became 2.4 and the 2.3 import was no longer available. We have to combine the QT_VERSION_MINOR based qmlRegisterModule() with a hard coded version that keeps the old version 2.3 available. Task-number: QTBUG-63149 Change-Id: Ie268fa52282342930349f6b7c46052964e7073c2 Reviewed-by: Mitch Curtis --- src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp index 1fcacc5e..9a329d03 100644 --- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp +++ b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp @@ -82,7 +82,8 @@ QtQuickControls2FusionStylePlugin::QtQuickControls2FusionStylePlugin(QObject *pa void QtQuickControls2FusionStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.10->2.3, 5.11->2.4... + qmlRegisterModule(uri, 2, 3); // Qt 5.10->2.3 + qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5... } void QtQuickControls2FusionStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) @@ -90,7 +91,7 @@ void QtQuickControls2FusionStylePlugin::initializeEngine(QQmlEngine *engine, con QQuickStylePlugin::initializeEngine(engine, uri); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.10->2.3, 5.11->2.4... + qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5... qmlRegisterSingletonType(import, 2, 3, "Fusion", styleSingleton); -- cgit v1.2.3