diff --git a/examples/Browser.qml b/examples/Browser.qml
index 2fb4c3178d06c5fae6e48c2fd82df4e6e0061f1d..f8464103ff7a9134f9680217ee6db6de4449fc12 100644
--- a/examples/Browser.qml
+++ b/examples/Browser.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import QtWebKit 1.0
import "content"
diff --git a/examples/BrowserTab.qml b/examples/BrowserTab.qml
index 65dabb09e7d0705ad751bf0009206b1f2189f23b..e7c416e04f0e7d948d5beb54c1987003c2068f0c 100644
--- a/examples/BrowserTab.qml
+++ b/examples/BrowserTab.qml
@@ -1,5 +1,5 @@
import QtQuick 1.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import QtWebKit 1.0
import "content"
diff --git a/examples/Gallery.qml b/examples/Gallery.qml
index 22b9d7dfd03587f8345ba408468f870a62f7b735..ff78c182561e57bce8dfd96d2d0f56c64d733265 100644
--- a/examples/Gallery.qml
+++ b/examples/Gallery.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import "content"
diff --git a/examples/Layout.qml b/examples/Layout.qml
index d88eca871779bed92abf9c62ed273ecfc9bb4b59..4bc3bafa7960c0ac913503f5b53125864d000ce1 100644
--- a/examples/Layout.qml
+++ b/examples/Layout.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
width: 600
diff --git a/examples/Menus.qml b/examples/Menus.qml
index 627033bf22abd7654b56af0a2a728e51c27f92fe..a7f2d7e7ffe045abd8112972ae2ef2f8d3146bbd 100644
--- a/examples/Menus.qml
+++ b/examples/Menus.qml
@@ -1,6 +1,6 @@
import QtQuick 2.0
//import "../components"
-import QtDesktop 0.2
+import QtDesktop 1.0
Rectangle {
diff --git a/examples/ModelView.qml b/examples/ModelView.qml
index 8d89e196eb816378006b82911525c3213b024342..55ec0a3b7b8a84646bc62620bc0e3b8b4e687731 100644
--- a/examples/ModelView.qml
+++ b/examples/ModelView.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
//import QtQuick.XmlListModel 2.0
Item {
diff --git a/examples/SplitterGallery.qml b/examples/SplitterGallery.qml
index d3c5cc52485c239fe5e8459ac05ca5072d5f6198..02b74a270be9333bf829ebbb77c5b04748b639da 100644
--- a/examples/SplitterGallery.qml
+++ b/examples/SplitterGallery.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Rectangle {
width: 800
diff --git a/examples/TableViewGallery.qml b/examples/TableViewGallery.qml
index 20cf97ab9741587a41ea1ce76a5d482684962682..4d48eef61db2f1e82d68a195d15a30034c639a33 100644
--- a/examples/TableViewGallery.qml
+++ b/examples/TableViewGallery.qml
@@ -1,5 +1,5 @@
import QtQuick 1.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Rectangle {
diff --git a/examples/TopLevel.qml b/examples/TopLevel.qml
index 62200582de040a8cfcc0aa2d30a5067b1cfa6d48..579128d7451f3b70b812e1ecf707bbd33795fa57 100644
--- a/examples/TopLevel.qml
+++ b/examples/TopLevel.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import "content"
ApplicationWindow {
diff --git a/examples/TopLevelBrowser.qml b/examples/TopLevelBrowser.qml
index ce8995a696bd82b172aa3dcd1625549adf84fd3a..bb3f876b7ee5a5f492a9203810e1ac64d31eab59 100644
--- a/examples/TopLevelBrowser.qml
+++ b/examples/TopLevelBrowser.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import "content"
Window {
diff --git a/examples/WindowContextMenu.qml b/examples/WindowContextMenu.qml
index 045da29f505ba4cfdf9cefc90a0e50ff55a39152..4a0c9f9a38f2c369cabaa8b333fa4371fc437f73 100644
--- a/examples/WindowContextMenu.qml
+++ b/examples/WindowContextMenu.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import QtQuick.Window 2.0 // overrides any definition of Window in QtDesktop
Window {
diff --git a/examples/content/Panel.qml b/examples/content/Panel.qml
index 366e6f1dcbee0e30d567b01ecd6f0692a9537ae9..c757caf4d3747c2a5de02cfefae2280d8d7dd504 100644
--- a/examples/content/Panel.qml
+++ b/examples/content/Panel.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.1
+import QtDesktop 1.0
Rectangle {
id:root
diff --git a/imports/QtDesktop/ApplicationWindow.qml b/imports/QtDesktop/ApplicationWindow.qml
index 113a3212a94e399126773daf9a9d8f0b778567e7..81842f33c6a0db7def5944d650cd41a5f7ac2c52 100644
--- a/imports/QtDesktop/ApplicationWindow.qml
+++ b/imports/QtDesktop/ApplicationWindow.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Window {
id: root
diff --git a/imports/QtDesktop/Button.qml b/imports/QtDesktop/Button.qml
index 4ae591d15274c5c25c256436c82c0c72ca80e320..bf592184f5b78de3db684cfa196d2a8baf8fa116 100644
--- a/imports/QtDesktop/Button.qml
+++ b/imports/QtDesktop/Button.qml
@@ -40,7 +40,7 @@
import QtQuick 2.0
import "private"
-import QtDesktop 0.2
+import QtDesktop 1.0
BasicButton {
id: button
diff --git a/imports/QtDesktop/CheckBox.qml b/imports/QtDesktop/CheckBox.qml
index dfc2dbf88d7a6d84adeda186bca73dda7207e004..99b4a191245eb65f22d2b52066c4b34e6d1a1f53 100644
--- a/imports/QtDesktop/CheckBox.qml
+++ b/imports/QtDesktop/CheckBox.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import "private"
FocusScope {
diff --git a/imports/QtDesktop/ComboBox.qml b/imports/QtDesktop/ComboBox.qml
index 69aff685e10447b2fa48840d95137b5c096e61b6..f411b8f9e981140de65ed31b4b2d3d622c4e70b3 100644
--- a/imports/QtDesktop/ComboBox.qml
+++ b/imports/QtDesktop/ComboBox.qml
@@ -40,7 +40,7 @@
import QtQuick 2.0
import "private" as Private
-import QtDesktop 0.2
+import QtDesktop 1.0
/*
*
diff --git a/imports/QtDesktop/ContextMenu.qml b/imports/QtDesktop/ContextMenu.qml
index 0b8d6a31c4a92f88ed18f6e5e3d743f9a05d9898..01b393118acfd7606e76ebca2f02d7ca99e97752 100644
--- a/imports/QtDesktop/ContextMenu.qml
+++ b/imports/QtDesktop/ContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Menu {
id: root
diff --git a/imports/QtDesktop/Dial.qml b/imports/QtDesktop/Dial.qml
index e8b97656099364ed8bdcb8b736bd3346031428ce..1c34e847e01fa3b13a7bcf43d08eba2f36fcc218 100644
--- a/imports/QtDesktop/Dial.qml
+++ b/imports/QtDesktop/Dial.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
// jens: ContainsMouse breaks drag functionality
diff --git a/imports/QtDesktop/Frame.qml b/imports/QtDesktop/Frame.qml
index ab35612e51b814c8bbca5bff165c0a603bceee38..9033e4aa86b0e298f37b462678375e99051c0127 100644
--- a/imports/QtDesktop/Frame.qml
+++ b/imports/QtDesktop/Frame.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
id: frame
diff --git a/imports/QtDesktop/GroupBox.qml b/imports/QtDesktop/GroupBox.qml
index c131a7f05235f4c8d13f3f2f8b28a15d84a63042..687b46f55b886def80927c04c2817749fd3713d6 100644
--- a/imports/QtDesktop/GroupBox.qml
+++ b/imports/QtDesktop/GroupBox.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
id: groupbox
diff --git a/imports/QtDesktop/ProgressBar.qml b/imports/QtDesktop/ProgressBar.qml
index 8c14d114f71b5725da84a4743aa69fe0df5eada9..c8768fa19191c044f1a3b8b7bc96cae220fa9a98 100644
--- a/imports/QtDesktop/ProgressBar.qml
+++ b/imports/QtDesktop/ProgressBar.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
id:progressbar
diff --git a/imports/QtDesktop/RadioButton.qml b/imports/QtDesktop/RadioButton.qml
index d5ec4e36ae012f106469c91baf027c275bfb8dec..471a6860cb6d5efa73b95b49f84640e165a9f611 100644
--- a/imports/QtDesktop/RadioButton.qml
+++ b/imports/QtDesktop/RadioButton.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
// jb : Size should not depend on background, we should make it consistent
diff --git a/imports/QtDesktop/ScrollArea.qml b/imports/QtDesktop/ScrollArea.qml
index d001335aa09edb79da4ab84f69054c1c122e7142..ce0ba0f247aa7f652606aed39e4729ed74dd76ba 100644
--- a/imports/QtDesktop/ScrollArea.qml
+++ b/imports/QtDesktop/ScrollArea.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import "private" as Private
FocusScope {
diff --git a/imports/QtDesktop/ScrollBar.qml b/imports/QtDesktop/ScrollBar.qml
index dd4c9090e9f57b062911f6375f8c7c2353ac26dc..e755bf61183539e57c20af5240f91a6389b4451f 100644
--- a/imports/QtDesktop/ScrollBar.qml
+++ b/imports/QtDesktop/ScrollBar.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
id: scrollbar
diff --git a/imports/QtDesktop/Slider.qml b/imports/QtDesktop/Slider.qml
index 6cb8fba94c09cc1008e40d42a6ebb0e1de195c5e..c128e635727b05b3f97be37ef09126a4f4bb35e3 100644
--- a/imports/QtDesktop/Slider.qml
+++ b/imports/QtDesktop/Slider.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
// jens: ContainsMouse breaks drag functionality
diff --git a/imports/QtDesktop/SpinBox.qml b/imports/QtDesktop/SpinBox.qml
index 6da9f39ea74c3d5a53cc5543046844f6c26fe70d..8fdab8963c0583a907808b8a1a2faad9b474f4e9 100644
--- a/imports/QtDesktop/SpinBox.qml
+++ b/imports/QtDesktop/SpinBox.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
FocusScope {
id: spinbox
diff --git a/imports/QtDesktop/SplitterColumn.qml b/imports/QtDesktop/SplitterColumn.qml
index 8b1d56b5b6687a72e22c0e7b2511ec4c3881ce95..c9c83d8288035e94fd5110cae4d6e49707aa5a40 100644
--- a/imports/QtDesktop/SplitterColumn.qml
+++ b/imports/QtDesktop/SplitterColumn.qml
@@ -40,7 +40,7 @@
import QtQuick 2.0
import "private" as Private
-import QtDesktop 0.2
+import QtDesktop 1.0
/*
*
diff --git a/imports/QtDesktop/SplitterRow.qml b/imports/QtDesktop/SplitterRow.qml
index e8be6acc4cd2265bd5ee4e0c7341bb536d4191f3..1ddef404e23e99e7f0157c0fe4e6692d50b1f81d 100644
--- a/imports/QtDesktop/SplitterRow.qml
+++ b/imports/QtDesktop/SplitterRow.qml
@@ -40,7 +40,7 @@
import QtQuick 2.0
import "private" as Private
-import QtDesktop 0.2
+import QtDesktop 1.0
/*
*
diff --git a/imports/QtDesktop/StatusBar.qml b/imports/QtDesktop/StatusBar.qml
index f21e0f9eceafe534c16bae49860aa208633fdb39..70d8bcc0ecd8316203e734e0d30475833d4e4a1a 100644
--- a/imports/QtDesktop/StatusBar.qml
+++ b/imports/QtDesktop/StatusBar.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
width: parent ? parent.width : 200
diff --git a/imports/QtDesktop/TabBar.qml b/imports/QtDesktop/TabBar.qml
index dac0dda0017f41b0d25cb02a7f9989ef441dd926..08d0e56786df90b6dfb0794b61b1b2a71124e6f1 100644
--- a/imports/QtDesktop/TabBar.qml
+++ b/imports/QtDesktop/TabBar.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
id: tabbar
diff --git a/imports/QtDesktop/TabFrame.qml b/imports/QtDesktop/TabFrame.qml
index 5a8736b82d632b9ef53011b7503c76d8fe5c5e27..7e0ceebb4b42953cdf3bff137264027b64f74b42 100644
--- a/imports/QtDesktop/TabFrame.qml
+++ b/imports/QtDesktop/TabFrame.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Item {
id: tabWidget
diff --git a/imports/QtDesktop/TableView.qml b/imports/QtDesktop/TableView.qml
index b4b320c155b44281d53066b1c8322f53358c440d..4d2da09b7c44d75273d4eb3d1ae54629dd1048fd 100644
--- a/imports/QtDesktop/TableView.qml
+++ b/imports/QtDesktop/TableView.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import "private" as Private
/*
diff --git a/imports/QtDesktop/TextArea.qml b/imports/QtDesktop/TextArea.qml
index 34b90d7c22b77248339926208d7133a67c8f3e33..62e0661fab7fba083d6bb37489dce21308f362db 100644
--- a/imports/QtDesktop/TextArea.qml
+++ b/imports/QtDesktop/TextArea.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
ScrollArea {
id: area
diff --git a/imports/QtDesktop/TextField.qml b/imports/QtDesktop/TextField.qml
index 81d5605c323c78910db8e99d20c8ea28a5abad0d..bd53db468d0dcc9b6e967a1895008034591af01c 100644
--- a/imports/QtDesktop/TextField.qml
+++ b/imports/QtDesktop/TextField.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
FocusScope {
id: textfield
diff --git a/imports/QtDesktop/ToolBar.qml b/imports/QtDesktop/ToolBar.qml
index 6892b8e7e16bf4ca874749c0f16f9def8601350c..96cde1644200c45fb553b88dfd3b8f7aabf748a7 100644
--- a/imports/QtDesktop/ToolBar.qml
+++ b/imports/QtDesktop/ToolBar.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
StyleItem {
id: toolbar
diff --git a/imports/QtDesktop/ToolButton.qml b/imports/QtDesktop/ToolButton.qml
index 2b36b8ba9572f451e48fe5c99e1689d31f1dfdad..e123a7547594b9a04c99b8b0780e892ce3bbbf40 100644
--- a/imports/QtDesktop/ToolButton.qml
+++ b/imports/QtDesktop/ToolButton.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
import "private" as Private
Private.BasicButton {
diff --git a/imports/QtDesktop/private/BasicButton.qml b/imports/QtDesktop/private/BasicButton.qml
index e3330ecced5375e4c93c7994a218df04a55335c6..6c39dc88f00f882df3eb0ee8e8efbb2991cb97b7 100644
--- a/imports/QtDesktop/private/BasicButton.qml
+++ b/imports/QtDesktop/private/BasicButton.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2 as Internal
+import QtDesktop 1.0 as Internal
Item {
id: button
diff --git a/imports/QtDesktop/private/ScrollAreaHelper.qml b/imports/QtDesktop/private/ScrollAreaHelper.qml
index a64100b701de74f4b8cbf03e0fdc9b32dee61a45..26c12d68974b7757be1006b7be5c7ce6cb89580f 100644
--- a/imports/QtDesktop/private/ScrollAreaHelper.qml
+++ b/imports/QtDesktop/private/ScrollAreaHelper.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
WheelArea {
id: wheelarea
diff --git a/imports/QtDesktop/private/Splitter.qml b/imports/QtDesktop/private/Splitter.qml
index a7e57a1bba219ac8e74f969dc6b78131d5a8ea9e..ffd2534840c6c0f7661da2a34b7f59dcbdec7197 100644
--- a/imports/QtDesktop/private/Splitter.qml
+++ b/imports/QtDesktop/private/Splitter.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Splitter {
id: root
diff --git a/imports/QtDesktop/qmldir b/imports/QtDesktop/qmldir
index 4154051810fec62dbf23018f95250d6805cbd6ef..c3863d8c8134209dd5a35d112b558ef65a09a11e 100644
--- a/imports/QtDesktop/qmldir
+++ b/imports/QtDesktop/qmldir
@@ -1,33 +1,33 @@
module QtDesktop
plugin styleplugin plugin
-ApplicationWindow 0.1 ApplicationWindow.qml
-Button 0.1 Button.qml
-ButtonRow 0.1 ButtonRow.qml
-ButtonColumn 0.1 ButtonColumn.qml
-CheckBox 0.1 CheckBox.qml
-ComboBox 0.1 ComboBox.qml
-ContextMenu 0.1 ContextMenu.qml
-Dial 0.1 Dial.qml
-Dialog 0.1 Dialog.qml
-Frame 0.1 Frame.qml
-GroupBox 0.1 GroupBox.qml
-Label 0.1 Label.qml
-ProgressBar 0.1 ProgressBar.qml
-RadioButton 0.1 RadioButton.qml
-ScrollArea 0.1 ScrollArea.qml
-ScrollBar 0.1 ScrollBar.qml
-Slider 0.1 Slider.qml
-SpinBox 0.1 SpinBox.qml
-SplitterRow 0.1 SplitterRow.qml
-SplitterColumn 0.1 SplitterColumn.qml
-StatusBar 0.1 StatusBar.qml
-Tab 0.1 Tab.qml
-TabBar 0.1 TabBar.qml
-TabFrame 0.1 TabFrame.qml
-TableView 0.1 TableView.qml
-TableColumn 0.1 TableColumn.qml
-TextArea 0.1 TextArea.qml
-TextField 0.1 TextField.qml
-ToolBar 0.1 ToolBar.qml
-ToolButton 0.1 ToolButton.qml
+ApplicationWindow 1.0 ApplicationWindow.qml
+Button 1.0 Button.qml
+ButtonRow 1.0 ButtonRow.qml
+ButtonColumn 1.0 ButtonColumn.qml
+CheckBox 1.0 CheckBox.qml
+ComboBox 1.0 ComboBox.qml
+ContextMenu 1.0 ContextMenu.qml
+Dial 1.0 Dial.qml
+Dialog 1.0 Dialog.qml
+Frame 1.0 Frame.qml
+GroupBox 1.0 GroupBox.qml
+Label 1.0 Label.qml
+ProgressBar 1.0 ProgressBar.qml
+RadioButton 1.0 RadioButton.qml
+ScrollArea 1.0 ScrollArea.qml
+ScrollBar 1.0 ScrollBar.qml
+Slider 1.0 Slider.qml
+SpinBox 1.0 SpinBox.qml
+SplitterRow 1.0 SplitterRow.qml
+SplitterColumn 1.0 SplitterColumn.qml
+StatusBar 1.0 StatusBar.qml
+Tab 1.0 Tab.qml
+TabBar 1.0 TabBar.qml
+TabFrame 1.0 TabFrame.qml
+TableView 1.0 TableView.qml
+TableColumn 1.0 TableColumn.qml
+TextArea 1.0 TextArea.qml
+TextField 1.0 TextField.qml
+ToolBar 1.0 ToolBar.qml
+ToolButton 1.0 ToolButton.qml
diff --git a/src/qstyleplugin.cpp b/src/qstyleplugin.cpp
index b5fe70501baf043abed20b9191dc2e0066930ad8..0e2321c6871b20cf386aff91899049f254cf2447 100644
--- a/src/qstyleplugin.cpp
+++ b/src/qstyleplugin.cpp
@@ -93,30 +93,30 @@ void StylePlugin::registerTypes(const char *uri)
setenv("QML_BAD_GUI_RENDER_LOOP", "1", 0);
#endif
- qmlRegisterSingletonType<QQuickComponentsPrivate>(uri, 0, 2, "PrivateHelper", registerPrivateModule);
+ qmlRegisterSingletonType<QQuickComponentsPrivate>(uri, 1, 0, "PrivateHelper", registerPrivateModule);
- qmlRegisterType<QStyleItem>(uri, 0, 2, "StyleItem");
- qmlRegisterType<QRangeModel>(uri, 0, 2, "RangeModel");
- qmlRegisterType<QWheelArea>(uri, 0, 2, "WheelArea");
+ qmlRegisterType<QStyleItem>(uri, 1, 0, "StyleItem");
+ qmlRegisterType<QRangeModel>(uri, 1, 0, "RangeModel");
+ qmlRegisterType<QWheelArea>(uri, 1, 0, "WheelArea");
- qmlRegisterType<QtMenu>(uri, 0, 2, "Menu");
- qmlRegisterType<QtMenuBar>(uri, 0, 2, "MenuBar");
- qmlRegisterType<QtMenuItem>(uri, 0, 2, "MenuItem");
- qmlRegisterType<QtMenuSeparator>(uri, 0, 2, "Separator");
+ qmlRegisterType<QtMenu>(uri, 1, 0, "Menu");
+ qmlRegisterType<QtMenuBar>(uri, 1, 0, "MenuBar");
+ qmlRegisterType<QtMenuItem>(uri, 1, 0, "MenuItem");
+ qmlRegisterType<QtMenuSeparator>(uri, 1, 0, "Separator");
- qmlRegisterType<QQuickComponentsRowLayout>(uri, 0, 2, "RowLayout");
- qmlRegisterType<QQuickComponentsColumnLayout>(uri, 0, 2, "ColumnLayout");
- qmlRegisterUncreatableType<QQuickComponentsLayout>(uri, 0, 2, "Layout",
+ qmlRegisterType<QQuickComponentsRowLayout>(uri, 1, 0, "RowLayout");
+ qmlRegisterType<QQuickComponentsColumnLayout>(uri, 1, 0, "ColumnLayout");
+ qmlRegisterUncreatableType<QQuickComponentsLayout>(uri, 1, 0, "Layout",
QLatin1String("Do not create objects of type Layout"));
- qmlRegisterType<QFileDialogItem>(uri, 0, 2, "FileDialog");
+ qmlRegisterType<QFileDialogItem>(uri, 1, 0, "FileDialog");
- qmlRegisterType<QFileSystemModel>(uri, 0, 2, "FileSystemModel");
- qmlRegisterType<QtSplitterBase>(uri, 0, 2, "Splitter");
- qmlRegisterType<QQuickWindow>(uri, 0, 2, "Window");
+ qmlRegisterType<QFileSystemModel>(uri, 1, 0, "FileSystemModel");
+ qmlRegisterType<QtSplitterBase>(uri, 1, 0, "Splitter");
+ qmlRegisterType<QQuickWindow>(uri, 1, 0, "Window");
- qmlRegisterUncreatableType<QtMenuBase>(uri, 0, 1, "NativeMenuBase", QLatin1String("Do not create objects of type NativeMenuBase"));
- qmlRegisterUncreatableType<QDesktopItem>(uri, 0,2,"Desktop", QLatin1String("Do not create objects of type Desktop"));
+ qmlRegisterUncreatableType<QtMenuBase>(uri, 1, 0, "NativeMenuBase", QLatin1String("Do not create objects of type NativeMenuBase"));
+ qmlRegisterUncreatableType<QDesktopItem>(uri, 1, 0,"Desktop", QLatin1String("Do not create objects of type Desktop"));
}
void StylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/tests/manual/FileDialogTest.qml b/tests/manual/FileDialogTest.qml
index 0f78bdba069e5c02ec10fdc3d9df2bcf0193ef39..86549b5ee47dd4516e9a0fcbe5517e4a3c8ea221 100644
--- a/tests/manual/FileDialogTest.qml
+++ b/tests/manual/FileDialogTest.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
Rectangle {
diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml
index 0747eed90cbb0cc6b2d9239d14b3b3e7fc911036..99e2f2f419d6cd8629cdfea5315aaa25d603b304 100644
--- a/tests/manual/splitter.qml
+++ b/tests/manual/splitter.qml
@@ -1,5 +1,5 @@
import QtQuick 2.0
-import QtDesktop 0.2
+import QtDesktop 1.0
ApplicationWindow {
width: 400