diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:10:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 14:10:22 +0200 |
| commit | 26f379b8e8ff448e830e0c0e483ea7992366be5c (patch) | |
| tree | ab08ee3e890a62d94fd466fec5f703231341e91c /src/imports/controls/material | |
| parent | 35c23c43636a1ee24ef47dacb128daff31d39ee3 (diff) | |
| parent | 341ace84485ffb3c2f05818e1b95604849217c9a (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: Ifa2fade18b10478370131f0dee875ab1a37c7772
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index eb0e6c87..d8cc04dd 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -68,11 +68,11 @@ QtQuickControls2MaterialStylePlugin::QtQuickControls2MaterialStylePlugin(QObject void QtQuickControls2MaterialStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... + qmlRegisterModule(uri, 2, 15); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 2, 0, "Material", tr("Material is an attached property")); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... + qmlRegisterModule(import, 2, 15); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterType<QQuickMaterialBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); qmlRegisterType<QQuickMaterialProgressBar>(import, 2, 0, "ProgressBarImpl"); |