Tie minor version of all imports to Qt's minor version

This change makes all Qt Quick Controls 2 imports match the current
Qt minor version, which is 12 as of this patch.

It also updates all other Qt Quick imports to match.
This will also make future version bumps easier as all version numbers
in existing code/docs will match.

The following commands were used to verify that no old versions remain:

for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done
for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done
for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done

[ChangeLog] From Qt 5.12 onwards, all import versions in
Qt Quick Controls 2 follow the same minor version as Qt's
minor version number. For example, the import version for Qt 5.12 is:
"import QtQuick.Controls 2.12".

Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3
Fixes: QTBUG-71095
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

5 files changed, 14 insertions, 14 deletions

diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index f5d80fb9..acd98470 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
     \image qtquickcontrols2-applicationwindow-wireframe.png
 
     \qml
-    import QtQuick.Controls 2.3
+    import QtQuick.Controls 2.12
 
     ApplicationWindow {
         visible: true
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index f2d74b31..95b27512 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -68,9 +68,9 @@ QT_BEGIN_NAMESPACE
     drawer is then opened by \e "dragging" it out from the left edge of the
     window.
 
-    \code
-    import QtQuick 2.7
-    import QtQuick.Controls 2.0
+    \code \QtMinorVersion
+    import QtQuick 2.\1
+    import QtQuick.Controls 2.\1
 
     ApplicationWindow {
         id: window
@@ -98,9 +98,9 @@ QT_BEGIN_NAMESPACE
     Drawer can be configured to cover only part of its window edge. The following example
     illustrates how Drawer can be positioned to appear below a window header:
 
-    \code
-    import QtQuick 2.7
-    import QtQuick.Controls 2.0
+    \code \QtMinorVersion
+    import QtQuick 2.\1
+    import QtQuick.Controls 2.\1
 
     ApplicationWindow {
         id: window
@@ -124,9 +124,9 @@ QT_BEGIN_NAMESPACE
     In the image above, the application's contents are \e "pushed" across the
     screen. This is achieved by applying a translation to the contents:
 
-    \code
-    import QtQuick 2.7
-    import QtQuick.Controls 2.1
+    \code \QtMinorVersion
+    import QtQuick 2.\1
+    import QtQuick.Controls 2.\1
 
     ApplicationWindow {
         id: window
diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp
index 0e2ed9e3..f6b8c4b2 100644
--- a/src/quicktemplates2/qquickmenuseparator.cpp
+++ b/src/quicktemplates2/qquickmenuseparator.cpp
@@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE
     \image qtquickcontrols2-menuseparator.png
 
     \quotefromfile qtquickcontrols2-menuseparator-custom.qml
-    \skipto import QtQuick 2.6
-    \printuntil import QtQuick.Controls 2.1
+    \skipto import QtQuick
+    \printuntil import QtQuick.Controls
     \skipto Menu
     \printto contentItem.parent: window
     \skipline contentItem.parent: window
diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp
index 93196c4c..a8c828f1 100644
--- a/src/quicktemplates2/qquickpage.cpp
+++ b/src/quicktemplates2/qquickpage.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
     toolbar header and an application-wide tabbar footer.
 
     \qml
-    import QtQuick.Controls 2.1
+    import QtQuick.Controls 2.12
 
     ApplicationWindow {
         visible: true
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index d5e2c940..dcced8dc 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 
     \qml
     import QtQuick.Window 2.2
-    import QtQuick.Controls 2.1
+    import QtQuick.Controls 2.12
 
     ApplicationWindow {
         id: window