Remove all version numbers from QML imports

As of Qt 6, the latest version will be used by default. This saves us a
lot of effort in terms of version bumps.

A similar change was done to qtquickcontrols2 in
d451cab0c8b727fa7f12a169a3d6ee449a3a1902.

Change-Id: I092b8a5988b69f3018f8199cac2aeaaafdf4bc38
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

10 files changed, 66 insertions, 66 deletions

diff --git a/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml b/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml
index f3dc4ace..c2cc23e0 100644
--- a/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml
+++ b/tests/auto/inputpanel/data/inputpanel/handwritinginputpanel.qml
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.1
+import QtTest
+import QtQuick
+import QtQuick.VirtualKeyboard
 import "handwriting.js" as Handwriting
 import "utils.js" as Utils
 
diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
index dd46a5b9..4d40840b 100644
--- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
+++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.3
-import QtQuick.VirtualKeyboard.Settings 2.2
+import QtTest
+import QtQuick
+import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Settings
 import "handwriting.js" as Handwriting
 import "utils.js" as Utils
 
diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml
index ec1dbd97..f45efeea 100644
--- a/tests/auto/inputpanel/data/tst_inputpanel.qml
+++ b/tests/auto/inputpanel/data/tst_inputpanel.qml
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
-import QtQuick 2.0
-import QtQuick.Window 2.3
+import QtTest
+import QtQuick
+import QtQuick.Window
 
 Rectangle {
     id: container
@@ -145,65 +145,65 @@ Rectangle {
         function test_versionCheck_data() {
             return [
                 // Note: Add new import versions here
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard 1.0; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard; \
                         Item {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard 1.1; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard; \
                         Item {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard 1.2; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard; \
                         Item {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard 1.3; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard; \
                         Item {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard 2.0; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard; \
                         Item {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard 2.1; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard; \
                         Item {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Styles 1.0; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Styles; \
                         KeyboardStyle {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Styles 1.1; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Styles; \
                         KeyboardStyle {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Styles 1.2; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Styles; \
                         KeyboardStyle {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Styles 1.3; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Styles; \
                         KeyboardStyle {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Styles 2.0; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Styles; \
                         KeyboardStyle {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Styles 2.1; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Styles; \
                         KeyboardStyle {}" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Settings 1.0; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Settings; \
                         Item { property var styleName: VirtualKeyboardSettings.styleName }" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Settings 1.1; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Settings; \
                         Item { property var styleName: VirtualKeyboardSettings.styleName }" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Settings 1.2; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Settings; \
                         Item { property var styleName: VirtualKeyboardSettings.styleName }" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Settings 2.0; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Settings; \
                         Item { property var styleName: VirtualKeyboardSettings.styleName; \
                                property var locale: VirtualKeyboardSettings.locale; \
                                property var availableLocales: VirtualKeyboardSettings.availableLocales; \
                                property var activeLocales: VirtualKeyboardSettings.activeLocales }" },
-                { qml: "import QtQuick 2.0; \
-                        import QtQuick.VirtualKeyboard.Settings 2.1; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Settings; \
                         Item { property var styleName: VirtualKeyboardSettings.styleName; \
                                property var locale: VirtualKeyboardSettings.locale; \
                                property var availableLocales: VirtualKeyboardSettings.availableLocales; \
                                property var activeLocales: VirtualKeyboardSettings.activeLocales }" },
-                { qml: "import QtQuick 2.7; \
-                        import QtQuick.VirtualKeyboard.Settings 2.2; \
+                { qml: "import QtQuick; \
+                        import QtQuick.VirtualKeyboard.Settings; \
                         Item { property var styleName: VirtualKeyboardSettings.styleName; \
                                property var locale: VirtualKeyboardSettings.locale; \
                                property var availableLocales: VirtualKeyboardSettings.availableLocales; \
diff --git a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
index e58b8d66..184cf497 100644
--- a/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
+++ b/tests/auto/layoutfilesystem/data/layouts/en_GB/main.qml
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick
+import QtQuick.VirtualKeyboard
 
 KeyboardLayout {
     objectName: "en_GB"
diff --git a/tests/auto/layoutresources/data/layouts/en_GB/main.qml b/tests/auto/layoutresources/data/layouts/en_GB/main.qml
index e58b8d66..184cf497 100644
--- a/tests/auto/layoutresources/data/layouts/en_GB/main.qml
+++ b/tests/auto/layoutresources/data/layouts/en_GB/main.qml
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.1
+import QtQuick
+import QtQuick.VirtualKeyboard
 
 KeyboardLayout {
     objectName: "en_GB"
diff --git a/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml b/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml
index efb8e3bd..352a0f56 100644
--- a/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml
+++ b/tests/auto/styles/data/QtQuick/VirtualKeyboard/Styles/test/style.qml
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard 2.1
-import QtQuick.VirtualKeyboard.Styles 2.1
+import QtQuick
+import QtQuick.VirtualKeyboard
+import QtQuick.VirtualKeyboard.Styles
 
 KeyboardStyle {
 
diff --git a/tests/auto/styles/data/tst_styles.qml b/tests/auto/styles/data/tst_styles.qml
index 0b4d3b37..6a2b4e91 100644
--- a/tests/auto/styles/data/tst_styles.qml
+++ b/tests/auto/styles/data/tst_styles.qml
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-import QtTest 1.0
-import QtQuick 2.0
-import QtQuick.VirtualKeyboard.Settings 2.0
+import QtTest
+import QtQuick
+import QtQuick.VirtualKeyboard.Settings
 
 Item {
 
diff --git a/tests/manual/quickcontrols2/main.qml b/tests/manual/quickcontrols2/main.qml
index cfd4c0f5..7178638f 100644
--- a/tests/manual/quickcontrols2/main.qml
+++ b/tests/manual/quickcontrols2/main.qml
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.VirtualKeyboard 2.15
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.VirtualKeyboard
 
 ApplicationWindow {
     visible: true
diff --git a/tests/manual/x11vkbwrapper/Keyboard.qml b/tests/manual/x11vkbwrapper/Keyboard.qml
index 152bdb98..3ab1bd64 100644
--- a/tests/manual/x11vkbwrapper/Keyboard.qml
+++ b/tests/manual/x11vkbwrapper/Keyboard.qml
@@ -27,10 +27,10 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Window 2.2
-import QtQuick.VirtualKeyboard 2.2
-import Qt.labs.platform 1.1
+import QtQuick
+import QtQuick.Window
+import QtQuick.VirtualKeyboard
+import Qt.labs.platform
 
 Window {
     id: keyboardWindow
diff --git a/tests/manual/x11vkbwrapper/main.qml b/tests/manual/x11vkbwrapper/main.qml
index b5a0221f..f2ba35cd 100644
--- a/tests/manual/x11vkbwrapper/main.qml
+++ b/tests/manual/x11vkbwrapper/main.qml
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.12
-import QtQuick.Window 2.2
+import QtQuick
+import QtQuick.Window
 
 Window {
     id: window