diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-12 13:10:26 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-12 12:39:23 +0000 |
| commit | a5792366f81fea6eb5ab3e301cd7abdfec0820c7 (patch) | |
| tree | 5129599ff3a42cc56000e0262ce3f412ad239c51 /src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp | |
| parent | 97bb0c50a079a73410f6a04c47d60010dacbb1fd (diff) | |
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp')
| -rw-r--r-- | src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp | 5 |
1 files 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<QQuickFusionStyle>(import, 2, 3, "Fusion", styleSingleton); |