diff options
Diffstat (limited to 'src/imports/controls/material')
45 files changed, 74 insertions, 74 deletions
diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 26604fdb..a09cd89f 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -37,7 +37,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.ApplicationWindow { id: window diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index f631dfb1..bf3d445e 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.BusyIndicator { id: control diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 330d2eb8..1be54234 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 import QtGraphicalEffects 1.0 T.Button { diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index e9331f60..a93a1bb1 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.CheckBox { id: control diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index 8381aeed..99248433 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.CheckDelegate { id: control diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index 31e1abaf..b41321fd 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 Rectangle { id: indicatorItem diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index cc5268d1..aeeca1ea 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -36,9 +36,9 @@ import QtQuick 2.6 import QtQuick.Window 2.2 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 import QtGraphicalEffects 1.0 T.ComboBox { diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index 1f1c986c..5d1f6270 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Dial { id: control diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml index 35a362de..b7d7cfc5 100644 --- a/src/imports/controls/material/Drawer.qml +++ b/src/imports/controls/material/Drawer.qml @@ -37,7 +37,7 @@ import QtQuick 2.6 import QtGraphicalEffects 1.0 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Drawer { id: control diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index 7a7dacf8..65eab21a 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Frame { id: control diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index 2d1f80c2..8e7704a0 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.GroupBox { id: control diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index 89a870ac..0135a0ec 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.ItemDelegate { id: control diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml index c179bdf4..8bda5cc2 100644 --- a/src/imports/controls/material/Label.qml +++ b/src/imports/controls/material/Label.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Label { id: control diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index c53b031c..2d4e7fac 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 import QtGraphicalEffects 1.0 T.Menu { diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index e687a78f..e537870c 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.MenuItem { id: control diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index adeb8b64..b155b2e1 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Page { id: control diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 6bde1473..085a131d 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.PageIndicator { id: control diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index 642dc1f1..43f9e34a 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Pane { id: control diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index bfee632a..08bfaa19 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -37,7 +37,7 @@ import QtQuick 2.6 import QtGraphicalEffects 1.0 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Popup { id: control diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index a475c648..cab54952 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.ProgressBar { id: control diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index bcfd071f..02687315 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.RadioButton { id: control diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 88c1aa5c..8bcc86f8 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.RadioDelegate { id: control diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml index 0d4b9c9c..dbd950de 100644 --- a/src/imports/controls/material/RadioIndicator.qml +++ b/src/imports/controls/material/RadioIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index fdca41fb..d7589cfd 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.RangeSlider { id: control diff --git a/src/imports/controls/material/Ripple.qml b/src/imports/controls/material/Ripple.qml index c3415712..15650384 100644 --- a/src/imports/controls/material/Ripple.qml +++ b/src/imports/controls/material/Ripple.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 Rectangle { property Item control diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index a930e167..41ee5eff 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.ScrollBar { id: control diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index 9a7b1b5d..0219aa2f 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.ScrollIndicator { id: control diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index 3a892fff..8401bea5 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.Slider { id: control diff --git a/src/imports/controls/material/SliderHandle.qml b/src/imports/controls/material/SliderHandle.qml index 5b20dbb9..49f833d0 100644 --- a/src/imports/controls/material/SliderHandle.qml +++ b/src/imports/controls/material/SliderHandle.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 Item { id: root diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index 447ac411..828ac9cb 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -37,8 +37,8 @@ import QtQuick 2.6 import QtGraphicalEffects 1.0 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.SpinBox { id: control diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index da6d7d72..4dc666e7 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.SwipeDelegate { id: control diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index f256781a..37776100 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 import QtQuick.Templates 2.0 as T T.Switch { diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index adfd508d..217cdcca 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.SwitchDelegate { id: control diff --git a/src/imports/controls/material/SwitchIndicator.qml b/src/imports/controls/material/SwitchIndicator.qml index 24d37b8a..403587b9 100644 --- a/src/imports/controls/material/SwitchIndicator.qml +++ b/src/imports/controls/material/SwitchIndicator.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtGraphicalEffects 1.0 -import Qt.labs.controls.material 1.0 -import Qt.labs.controls.material.impl 1.0 +import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 Item { implicitWidth: 38 diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml index 4d0ed57c..79238da4 100644 --- a/src/imports/controls/material/TabBar.qml +++ b/src/imports/controls/material/TabBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.TabBar { id: control diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index 61542fa1..9659205b 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.TabButton { id: control diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index c087911d..aa9cb12f 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.TextArea { id: control diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index d037d491..2f3b9f2b 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.TextField { id: control diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index 432f77fb..b87451a0 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.ToolBar { id: control diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index bdb341f6..a02254c4 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.ToolButton { id: control diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index 1ca0c127..ec0deefe 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.ToolTip { id: control diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 959415f2..8ac8a7c4 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.material 1.0 +import QtQuick.Controls.Material 2.0 T.Tumbler { id: control diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro index 33c1d59a..05b7321f 100644 --- a/src/imports/controls/material/material.pro +++ b/src/imports/controls/material/material.pro @@ -1,6 +1,6 @@ TARGET = qtquickmaterialstyleplugin -TARGETPATH = Qt/labs/controls/material -IMPORT_VERSION = 1.0 +TARGETPATH = QtQuick/Controls.2/Material +IMPORT_VERSION = 2.0 QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir index f8666f9e..64891e23 100644 --- a/src/imports/controls/material/qmldir +++ b/src/imports/controls/material/qmldir @@ -1,5 +1,5 @@ -module Qt.labs.controls.material +module QtQuick.Controls.Material plugin qtquickmaterialstyleplugin classname QtQuickMaterialStylePlugin -depends Qt.labs.controls 1.0 +depends QtQuick.Controls 2.0 depends QtGraphicalEffects 1.0 diff --git a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp index 2ae2d708..3ed38b67 100644 --- a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp @@ -48,7 +48,7 @@ static inline void initResources() { Q_INIT_RESOURCE(qtquickmaterialstyleplugin); #ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_Qt_labs_controls_material); + Q_INIT_RESOURCE(qmake_QtQuick_Controls_Material); #endif } @@ -76,7 +76,7 @@ QtQuickMaterialStylePlugin::QtQuickMaterialStylePlugin(QObject *parent) : QQuick void QtQuickMaterialStylePlugin::registerTypes(const char *uri) { - qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", tr("Material is an attached property")); + qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 2, 0, "Material", tr("Material is an attached property")); } void QtQuickMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) @@ -84,15 +84,15 @@ void QtQuickMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char QQuickStylePlugin::initializeEngine(engine, uri); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterType<QQuickPaddedRectangle>(import, 1, 0, "PaddedRectangle"); - qmlRegisterType<QQuickMaterialProgressRing>(import, 1, 0, "ProgressRing"); - qmlRegisterType<QQuickMaterialProgressStrip>(import, 1, 0, "ProgressStrip"); - qmlRegisterType<QQuickMaterialRingAnimator>(import, 1, 0, "RingAnimator"); - qmlRegisterType<QQuickMaterialStripAnimator>(import, 1, 0, "StripAnimator"); - qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 1, 0, "CheckIndicator"); - qmlRegisterType(typeUrl(QStringLiteral("Ripple.qml")), import, 1, 0, "Ripple"); - qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 1, 0, "SliderHandle"); - qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 1, 0, "SwitchIndicator"); + qmlRegisterType<QQuickPaddedRectangle>(import, 2, 0, "PaddedRectangle"); + qmlRegisterType<QQuickMaterialProgressRing>(import, 2, 0, "ProgressRing"); + qmlRegisterType<QQuickMaterialProgressStrip>(import, 2, 0, "ProgressStrip"); + qmlRegisterType<QQuickMaterialRingAnimator>(import, 2, 0, "RingAnimator"); + qmlRegisterType<QQuickMaterialStripAnimator>(import, 2, 0, "StripAnimator"); + qmlRegisterType(typeUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("Ripple.qml")), import, 2, 0, "Ripple"); + qmlRegisterType(typeUrl(QStringLiteral("SliderHandle.qml")), import, 2, 0, "SliderHandle"); + qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } QString QtQuickMaterialStylePlugin::name() const |