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>

21 files changed, 23 insertions, 23 deletions

diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 5a782f2d..16a95510 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2plugin
-TARGETPATH = QtQuick/Controls.2
+TARGETPATH = QtQuick/Controls
 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += qml quick
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>
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
index a04f93cb..ec9d773e 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml
@@ -29,6 +29,6 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 
 Button {
-    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"
     display: Button.IconOnly
 }
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
index 0c1f8ef1..3bd35a84 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml
@@ -30,6 +30,6 @@ import QtQuick.Controls 2.12
 
 Button {
     text: "Button"
-    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"
     display: Button.TextBesideIcon
 }
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 5226646e..6ab649d0 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -58,7 +58,7 @@
     \c Button.qml. This file can be found in the following path in your Qt
     installation:
 
-    \c {$QTDIR/qml/QtQuick/Controls.2/Default/Button.qml}
+    \c {$QTDIR/qml/QtQuick/Controls/Default/Button.qml}
 
     After doing that, we'll simply add the following line:
 
@@ -397,7 +397,7 @@
     \endcode
 
     We then copy \c Button.qml from the Default style in
-    \c {$QTDIR/qml/QtQuick/Controls.2/Default/} into a new \c myproject folder in our
+    \c {$QTDIR/qml/QtQuick/Controls/Default/} into a new \c myproject folder in our
     project directory. Add the newly copied \c Button.qml to \c qml.qrc, which is
     the resource file that contains our QML files.
 
diff --git a/src/imports/controls/fusion/fusion.pro b/src/imports/controls/fusion/fusion.pro
index 663636da..49585212 100644
--- a/src/imports/controls/fusion/fusion.pro
+++ b/src/imports/controls/fusion/fusion.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2fusionstyleplugin
-TARGETPATH = QtQuick/Controls.2/Fusion
+TARGETPATH = QtQuick/Controls/Fusion
 
 IMPORT_NAME = QtQuick.Controls.Fusion
 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/fusion/impl/fusion-impl.pro b/src/imports/controls/fusion/impl/fusion-impl.pro
index e3333e18..78692abd 100644
--- a/src/imports/controls/fusion/impl/fusion-impl.pro
+++ b/src/imports/controls/fusion/impl/fusion-impl.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2fusionstyleimplplugin
-TARGETPATH = QtQuick/Controls.2/Fusion/impl
+TARGETPATH = QtQuick/Controls/Fusion/impl
 
 QML_IMPORT_NAME = QtQuick.Controls.Fusion.impl
 QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/imagine/imagine.pro b/src/imports/controls/imagine/imagine.pro
index 0dfba717..9bb6afd4 100644
--- a/src/imports/controls/imagine/imagine.pro
+++ b/src/imports/controls/imagine/imagine.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2imaginestyleplugin
-TARGETPATH = QtQuick/Controls.2/Imagine
+TARGETPATH = QtQuick/Controls/Imagine
 
 IMPORT_NAME = QtQuick.Controls.Imagine
 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/imagine/impl/imagine-impl.pro b/src/imports/controls/imagine/impl/imagine-impl.pro
index cb0f7043..9b45fd31 100644
--- a/src/imports/controls/imagine/impl/imagine-impl.pro
+++ b/src/imports/controls/imagine/impl/imagine-impl.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2imaginestyleimplplugin
-TARGETPATH = QtQuick/Controls.2/Imagine/impl
+TARGETPATH = QtQuick/Controls/Imagine/impl
 
 QML_IMPORT_NAME = QtQuick.Controls.Imagine.impl
 QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/material/impl/material-impl.pro b/src/imports/controls/material/impl/material-impl.pro
index f0a97b18..bc063d84 100644
--- a/src/imports/controls/material/impl/material-impl.pro
+++ b/src/imports/controls/material/impl/material-impl.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2materialstyleimplplugin
-TARGETPATH = QtQuick/Controls.2/Material/impl
+TARGETPATH = QtQuick/Controls/Material/impl
 
 QML_IMPORT_NAME = QtQuick.Controls.Material.impl
 QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 269f704d..ce96924e 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2materialstyleplugin
-TARGETPATH = QtQuick/Controls.2/Material
+TARGETPATH = QtQuick/Controls/Material
 
 IMPORT_NAME = QtQuick.Controls.Material
 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/universal/impl/universal-impl.pro b/src/imports/controls/universal/impl/universal-impl.pro
index 520f3243..a27ae154 100644
--- a/src/imports/controls/universal/impl/universal-impl.pro
+++ b/src/imports/controls/universal/impl/universal-impl.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2universalstyleimplplugin
-TARGETPATH = QtQuick/Controls.2/Universal/impl
+TARGETPATH = QtQuick/Controls/Universal/impl
 
 QML_IMPORT_NAME = QtQuick.Controls.Universal.impl
 QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index 9065936c..33dd8f14 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2universalstyleplugin
-TARGETPATH = QtQuick/Controls.2/Universal
+TARGETPATH = QtQuick/Controls/Universal
 
 IMPORT_NAME = QtQuick.Controls.Universal
 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
diff --git a/src/imports/controlsimpl/controlsimpl.pro b/src/imports/controlsimpl/controlsimpl.pro
index 70f3e170..89d4e1bd 100644
--- a/src/imports/controlsimpl/controlsimpl.pro
+++ b/src/imports/controlsimpl/controlsimpl.pro
@@ -1,5 +1,5 @@
 TARGET = qtquickcontrols2implplugin
-TARGETPATH = QtQuick/Controls.2/impl
+TARGETPATH = QtQuick/Controls/impl
 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
 
 QT += qml quick