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>

8 files changed, 9 insertions, 9 deletions

diff --git a/src/imports/controls/default/CheckBox.qml b/src/imports/controls/default/CheckBox.qml
index 3a7c3a06..eae6e208 100644
--- a/src/imports/controls/default/CheckBox.qml
+++ b/src/imports/controls/default/CheckBox.qml
@@ -68,7 +68,7 @@ T.CheckBox {
             y: (parent.height - height) / 2
             defaultColor: "#353637"
             color: control.palette.text
-            source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/default/CheckDelegate.qml b/src/imports/controls/default/CheckDelegate.qml
index 4dec9b98..176e0843 100644
--- a/src/imports/controls/default/CheckDelegate.qml
+++ b/src/imports/controls/default/CheckDelegate.qml
@@ -87,7 +87,7 @@ T.CheckDelegate {
             y: (parent.height - height) / 2
             defaultColor: "#353637"
             color: control.palette.text
-            source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
+            source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
             visible: control.checkState === Qt.Checked
         }
 
diff --git a/src/imports/controls/default/ComboBox.qml b/src/imports/controls/default/ComboBox.qml
index 2c36aac6..a402b7be 100644
--- a/src/imports/controls/default/ComboBox.qml
+++ b/src/imports/controls/default/ComboBox.qml
@@ -67,7 +67,7 @@ T.ComboBox {
         y: control.topPadding + (control.availableHeight - height) / 2
         color: control.palette.dark
         defaultColor: "#353637"
-        source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/double-arrow.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/double-arrow.png"
         opacity: enabled ? 1 : 0.3
     }
 
diff --git a/src/imports/controls/default/Dial.qml b/src/imports/controls/default/Dial.qml
index daae1e64..8e94e2fb 100644
--- a/src/imports/controls/default/Dial.qml
+++ b/src/imports/controls/default/Dial.qml
@@ -63,7 +63,7 @@ T.Dial {
         height: 10
         defaultColor: "#353637"
         color: control.visualFocus ? control.palette.highlight : control.palette.dark
-        source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/dial-indicator.png"
+        source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/dial-indicator.png"
         antialiasing: true
         opacity: control.enabled ? 1 : 0.3
         transform: [
diff --git a/src/imports/controls/default/MenuItem.qml b/src/imports/controls/default/MenuItem.qml
index 0632decb..678bac57 100644
--- a/src/imports/controls/default/MenuItem.qml
+++ b/src/imports/controls/default/MenuItem.qml
@@ -77,7 +77,7 @@ T.MenuItem {
         y: control.topPadding + (control.availableHeight - height) / 2
 
         visible: control.checked
-        source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png" : ""
+        source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" : ""
         color: control.palette.windowText
         defaultColor: "#353637"
     }
@@ -88,7 +88,7 @@ T.MenuItem {
 
         visible: control.subMenu
         mirror: control.mirrored
-        source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/arrow-indicator.png" : ""
+        source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/arrow-indicator.png" : ""
         color: control.palette.windowText
         defaultColor: "#353637"
     }
diff --git a/src/imports/controls/default/default.pro b/src/imports/controls/default/default.pro
index 46e46531..ae6761a5 100644
--- a/src/imports/controls/default/default.pro
+++ b/src/imports/controls/default/default.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2defaultstyleplugin
-TARGETPATH = QtQuick/Controls.2/Default
+TARGETPATH = QtQuick/Controls/Default
 
 IMPORT_NAME = QtQuick.Controls.Default
 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/default/impl/default-impl.pro b/src/imports/controls/default/impl/default-impl.pro
index 88ec2077..35368a5e 100644
--- a/src/imports/controls/default/impl/default-impl.pro
+++ b/src/imports/controls/default/impl/default-impl.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2defaultstyleimplplugin
-TARGETPATH = QtQuick/Controls.2/Default/impl
+TARGETPATH = QtQuick/Controls/Default/impl
 
 QML_IMPORT_NAME = QtQuick.Controls.Default.impl
 QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc
index eddadf2d..a6058dd1 100644
--- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc
+++ b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
-    <qresource prefix="/qt-project.org/imports/QtQuick/Controls.2/Default">
+    <qresource prefix="/qt-project.org/imports/QtQuick/Controls/Default">
         <file>images/arrow-indicator.png</file>
         <file>images/arrow-indicator@2x.png</file>
         <file>images/arrow-indicator@3x.png</file>