diff options
Diffstat (limited to 'src/imports/controls/universal')
44 files changed, 63 insertions, 63 deletions
diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index 2211bcc5..e0a0b351 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 -import Qt.labs.controls.universal.impl 1.0 +import QtQuick.Controls.Universal 2.0 +import QtQuick.Controls.Universal.impl 2.0 T.ApplicationWindow { id: window diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index b5d11fa8..ef666417 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 -import Qt.labs.controls.universal.impl 1.0 +import QtQuick.Controls.Universal 2.0 +import QtQuick.Controls.Universal.impl 2.0 T.BusyIndicator { id: control diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index 9e4ac774..fbe79b6b 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Button { id: control diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index a8365b9a..262f16b1 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 -import Qt.labs.controls.universal.impl 1.0 +import QtQuick.Controls.Universal 2.0 +import QtQuick.Controls.Universal.impl 2.0 T.CheckBox { id: control diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index 344183f5..da8fe326 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.CheckDelegate { id: control diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/CheckIndicator.qml index e9638e1b..a508ad18 100644 --- a/src/imports/controls/universal/CheckIndicator.qml +++ b/src/imports/controls/universal/CheckIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index f0da15ed..07e92a0e 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/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.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.ComboBox { id: control diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index 9595857f..466c6023 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Dial { id: control diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index 1318c0fa..e23403ae 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Drawer { id: control diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index 1d18c51b..8d8b9d71 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Frame { id: control diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index 09c9c0ec..a163fb11 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.GroupBox { id: control diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index b05382be..1bdcd620 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.ItemDelegate { id: control diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml index d4c693f5..9b50f4f5 100644 --- a/src/imports/controls/universal/Label.qml +++ b/src/imports/controls/universal/Label.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Label { id: control diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 1819bb4e..ed1fecfa 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/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.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Menu { id: control diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 5941a826..e14884ef 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.MenuItem { id: control diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index b1a0c64b..f4509b4b 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Page { id: control diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index 6949b34e..636f0297 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.PageIndicator { id: control diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml index cd7aef6d..7a97da55 100644 --- a/src/imports/controls/universal/Pane.qml +++ b/src/imports/controls/universal/Pane.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Pane { id: control diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index 633cc370..892db087 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Popup { id: control diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index 65ba192d..b8df774e 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 -import Qt.labs.controls.universal.impl 1.0 +import QtQuick.Controls.Universal 2.0 +import QtQuick.Controls.Universal.impl 2.0 T.ProgressBar { id: control diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index fe26df16..b2f29661 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 -import Qt.labs.controls.universal.impl 1.0 +import QtQuick.Controls.Universal 2.0 +import QtQuick.Controls.Universal.impl 2.0 T.RadioButton { id: control diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 58128df3..3b9214ae 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.RadioDelegate { id: control diff --git a/src/imports/controls/universal/RadioIndicator.qml b/src/imports/controls/universal/RadioIndicator.qml index 3fd74cbf..65790e6a 100644 --- a/src/imports/controls/universal/RadioIndicator.qml +++ b/src/imports/controls/universal/RadioIndicator.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index 7c01fc96..061f95dd 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.RangeSlider { id: control diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index b8b86183..19087384 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.ScrollBar { id: control diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index 6d8224c1..9f9f3fcf 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.ScrollIndicator { id: control diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index de02440a..9662acdf 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Slider { id: control diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index f3a6376a..4b9b4810 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.SpinBox { id: control diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml index a05bcc50..60239429 100644 --- a/src/imports/controls/universal/StackView.qml +++ b/src/imports/controls/universal/StackView.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.StackView { id: control diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index d73561ab..c908e517 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.SwipeDelegate { id: control diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 918fe64f..988b328f 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.Switch { id: control diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 85dd25f4..0d58824e 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.SwitchDelegate { id: control diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/SwitchIndicator.qml index 31d89779..b3d44d9e 100644 --- a/src/imports/controls/universal/SwitchIndicator.qml +++ b/src/imports/controls/universal/SwitchIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 Rectangle { implicitWidth: 44 diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml index 8c3552b0..fd53af15 100644 --- a/src/imports/controls/universal/TabBar.qml +++ b/src/imports/controls/universal/TabBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.TabBar { id: control diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 91803818..3a1845a5 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.TabButton { id: control diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 0e682217..e326512b 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.TextArea { id: control diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 4ada061a..69046e48 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.TextField { id: control diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml index f096d126..721d817e 100644 --- a/src/imports/controls/universal/ToolBar.qml +++ b/src/imports/controls/universal/ToolBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.ToolBar { id: control diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 084c0282..525623b5 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.ToolButton { id: control diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 7988f5ad..579edf92 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 +import QtQuick.Controls.Universal 2.0 T.ToolTip { id: control diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index ee80196f..5998a6aa 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -36,8 +36,8 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import Qt.labs.controls.universal 1.0 -import Qt.labs.controls 1.0 +import QtQuick.Controls.Universal 2.0 +import QtQuick.Controls 2.0 T.Tumbler { id: control diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir index 7b7d28a4..dd8caf52 100644 --- a/src/imports/controls/universal/qmldir +++ b/src/imports/controls/universal/qmldir @@ -1,4 +1,4 @@ -module Qt.labs.controls.universal +module QtQuick.Controls.Universal plugin qtquickuniversalstyleplugin classname QtQuickUniversalStylePlugin -depends Qt.labs.controls 1.0 +depends QtQuick.Controls 2.0 diff --git a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp index 41cebeda..e80e7d12 100644 --- a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp @@ -48,7 +48,7 @@ static inline void initResources() { Q_INIT_RESOURCE(qtquickuniversalstyleplugin); #ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_Qt_labs_controls_universal); + Q_INIT_RESOURCE(qmake_QtQuick_Controls_Universal); #endif } @@ -76,7 +76,7 @@ QtQuickUniversalStylePlugin::QtQuickUniversalStylePlugin(QObject *parent) : QQui void QtQuickUniversalStylePlugin::registerTypes(const char *uri) { - qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 1, 0, "Universal", tr("Universal is an attached property")); + qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 2, 0, "Universal", tr("Universal is an attached property")); } void QtQuickUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) @@ -86,14 +86,14 @@ void QtQuickUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const cha engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/universal/images"))); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterType<QQuickUniversalFocusRectangle>(import, 1, 0, "FocusRectangle"); - qmlRegisterType<QQuickUniversalProgressRing>(import, 1, 0, "ProgressRing"); - qmlRegisterType<QQuickUniversalProgressRingAnimator>(import, 1, 0, "ProgressRingAnimator"); - qmlRegisterType<QQuickUniversalProgressStrip>(import, 1, 0, "ProgressStrip"); - qmlRegisterType<QQuickUniversalProgressStripAnimator>(import, 1, 0, "ProgressStripAnimator"); - - qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 1, 0, "RadioIndicator"); - qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 1, 0, "SwitchIndicator"); + qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle"); + qmlRegisterType<QQuickUniversalProgressRing>(import, 2, 0, "ProgressRing"); + qmlRegisterType<QQuickUniversalProgressRingAnimator>(import, 2, 0, "ProgressRingAnimator"); + qmlRegisterType<QQuickUniversalProgressStrip>(import, 2, 0, "ProgressStrip"); + qmlRegisterType<QQuickUniversalProgressStripAnimator>(import, 2, 0, "ProgressStripAnimator"); + + qmlRegisterType(typeUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); + qmlRegisterType(typeUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } QString QtQuickUniversalStylePlugin::name() const diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index 658026c8..3e569831 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -1,6 +1,6 @@ TARGET = qtquickuniversalstyleplugin -TARGETPATH = Qt/labs/controls/universal -IMPORT_VERSION = 1.0 +TARGETPATH = QtQuick/Controls.2/Universal +IMPORT_VERSION = 2.0 QT += qml quick QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private |