Remove ".2" from TARGETPATH, resource prefixes, etc.

Qt Quick Controls 1 will be removed in Qt 6, so now we can have the
simplified path for ourselves.

Having the .2 in the path causes issues for importing now that the
version is being bumped to 6.

Task-number: QTBUG-82922
Change-Id: I0b92cdd44c42c19b1c82e7b9a7959b86ac26c6e2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

10 files changed, 20 insertions, 20 deletions

diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 22962fb3..57d92e7d 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -467,11 +467,11 @@ TestCase {
         var control = createTemporaryObject(button, testCase, {
             text: "Button",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml
index 74e91dfe..971d3514 100644
--- a/tests/auto/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/controls/data/tst_checkdelegate.qml
@@ -126,11 +126,11 @@ TestCase {
             text: "CheckDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml
index 7db20b64..f74a8a42 100644
--- a/tests/auto/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/controls/data/tst_itemdelegate.qml
@@ -118,11 +118,11 @@ TestCase {
             text: "ItemDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml
index 8f9f6014..a3433534 100644
--- a/tests/auto/controls/data/tst_menuitem.qml
+++ b/tests/auto/controls/data/tst_menuitem.qml
@@ -119,11 +119,11 @@ TestCase {
         var control = createTemporaryObject(menuItem, testCase, {
             text: "MenuItem",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var padding = data.mirrored ? control.contentItem.rightPadding : control.contentItem.leftPadding
         var iconImage = findChild(control.contentItem, "image")
diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml
index 7845fdff..88259165 100644
--- a/tests/auto/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/controls/data/tst_radiodelegate.qml
@@ -126,11 +126,11 @@ TestCase {
             text: "RadioDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml
index 57900dc4..b2a2813a 100644
--- a/tests/auto/controls/data/tst_roundbutton.qml
+++ b/tests/auto/controls/data/tst_roundbutton.qml
@@ -122,11 +122,11 @@ TestCase {
         var control = createTemporaryObject(roundButton, testCase, {
             text: "RoundButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 9e7a0a67..a2600774 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -1672,11 +1672,11 @@ TestCase {
             text: "SwipeDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index 3bdfc83d..890c89b8 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -560,11 +560,11 @@ TestCase {
             text: "SwitchDelegate",
             display: data.display,
             width: 400,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml
index 7893a516..2ebbd8b3 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/controls/data/tst_tabbutton.qml
@@ -134,11 +134,11 @@ TestCase {
         var control = createTemporaryObject(tabButton, testCase, {
             text: "TabButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 926b4595..c533c801 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -199,11 +199,11 @@ TestCase {
         var control = createTemporaryObject(toolButton, testCase, {
             text: "ToolButton",
             display: data.display,
-            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
+            "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
             "LayoutMirroring.enabled": !!data.mirrored
         })
         verify(control)
-        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+        compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png")
 
         var iconImage = findChild(control.contentItem, "image")
         var textLabel = findChild(control.contentItem, "label")