aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickiconimage
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-10-23 15:23:58 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-02 16:45:04 +0000
commit3c7bfc156797b2f3ef08a8cf620b79da80e4b061 (patch)
tree8eb2cc945b9dab6792df6f8df59472440d998457 /tests/auto/qquickiconimage
parent70fe6a67e8fdff5bc5486c4fe5c0e44242e10427 (diff)
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>
Diffstat (limited to 'tests/auto/qquickiconimage')
-rw-r--r--tests/auto/qquickiconimage/data/alignment.qml6
-rw-r--r--tests/auto/qquickiconimage/data/color.qml6
-rw-r--r--tests/auto/qquickiconimage/data/fileSelectors.qml6
-rw-r--r--tests/auto/qquickiconimage/data/imageProvider.qml8
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml6
-rw-r--r--tests/auto/qquickiconimage/data/root.qml2
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml6
-rw-r--r--tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml6
-rw-r--r--tests/auto/qquickiconimage/data/svgNoSizes.qml6
-rw-r--r--tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml6
-rw-r--r--tests/auto/qquickiconimage/data/translucentColors.qml6
15 files changed, 44 insertions, 44 deletions
diff --git a/tests/auto/qquickiconimage/data/alignment.qml b/tests/auto/qquickiconimage/data/alignment.qml
index 487ebfd0..4e5ac6e7 100644
--- a/tests/auto/qquickiconimage/data/alignment.qml
+++ b/tests/auto/qquickiconimage/data/alignment.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/color.qml b/tests/auto/qquickiconimage/data/color.qml
index d6f647e6..b5d40d70 100644
--- a/tests/auto/qquickiconimage/data/color.qml
+++ b/tests/auto/qquickiconimage/data/color.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/fileSelectors.qml b/tests/auto/qquickiconimage/data/fileSelectors.qml
index 487ebfd0..4e5ac6e7 100644
--- a/tests/auto/qquickiconimage/data/fileSelectors.qml
+++ b/tests/auto/qquickiconimage/data/fileSelectors.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/qquickiconimage/data/imageProvider.qml
index 0d7d3033..cf03ac7e 100644
--- a/tests/auto/qquickiconimage/data/imageProvider.qml
+++ b/tests/auto/qquickiconimage/data/imageProvider.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
-import QtQuick.Templates 2.3 as T
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
+import QtQuick.Templates 2.12 as T
IconLabel {
icon.color: "transparent"
diff --git a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml
index d6c33bb3..d0ea13c2 100644
--- a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml
+++ b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
IconImage {
name: "appointment-new"
diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml
index 487ebfd0..4e5ac6e7 100644
--- a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml
+++ b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
index c503d8cf..db6697d0 100644
--- a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
IconImage {
name: "appointment-new"
diff --git a/tests/auto/qquickiconimage/data/root.qml b/tests/auto/qquickiconimage/data/root.qml
index 0a8b8db9..31ad7265 100644
--- a/tests/auto/qquickiconimage/data/root.qml
+++ b/tests/auto/qquickiconimage/data/root.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.10
+import QtQuick 2.12
Item {
width: 200
diff --git a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml
index 33f4a2d3..08dcd55e 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml
index c246dc74..24678f8c 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
index ecbb7f6d..9ac26e22 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
IconImage {
source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png"
diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml
index f9e07899..655add7b 100644
--- a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml
+++ b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
IconImage {
source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png"
diff --git a/tests/auto/qquickiconimage/data/svgNoSizes.qml b/tests/auto/qquickiconimage/data/svgNoSizes.qml
index 17cccd26..d2652827 100644
--- a/tests/auto/qquickiconimage/data/svgNoSizes.qml
+++ b/tests/auto/qquickiconimage/data/svgNoSizes.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml
index 2387e98e..c9157700 100644
--- a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml
+++ b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
Row {
width: 200
diff --git a/tests/auto/qquickiconimage/data/translucentColors.qml b/tests/auto/qquickiconimage/data/translucentColors.qml
index 49178d76..fd208235 100644
--- a/tests/auto/qquickiconimage/data/translucentColors.qml
+++ b/tests/auto/qquickiconimage/data/translucentColors.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.impl 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
ApplicationWindow {
width: 500