aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/platform
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/platform
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/platform')
-rw-r--r--tests/auto/platform/data/tst_colordialog.qml2
-rw-r--r--tests/auto/platform/data/tst_filedialog.qml2
-rw-r--r--tests/auto/platform/data/tst_folderdialog.qml2
-rw-r--r--tests/auto/platform/data/tst_fontdialog.qml2
-rw-r--r--tests/auto/platform/data/tst_menu.qml2
-rw-r--r--tests/auto/platform/data/tst_menubar.qml2
-rw-r--r--tests/auto/platform/data/tst_menuitem.qml2
-rw-r--r--tests/auto/platform/data/tst_menuitemgroup.qml2
-rw-r--r--tests/auto/platform/data/tst_menuseparator.qml2
-rw-r--r--tests/auto/platform/data/tst_messagedialog.qml2
-rw-r--r--tests/auto/platform/data/tst_standardpaths.qml2
-rw-r--r--tests/auto/platform/data/tst_systemtrayicon.qml2
12 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/platform/data/tst_colordialog.qml b/tests/auto/platform/data/tst_colordialog.qml
index 224692f0..98122c25 100644
--- a/tests/auto/platform/data/tst_colordialog.qml
+++ b/tests/auto/platform/data/tst_colordialog.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_filedialog.qml b/tests/auto/platform/data/tst_filedialog.qml
index 8edb0ec4..775e24d3 100644
--- a/tests/auto/platform/data/tst_filedialog.qml
+++ b/tests/auto/platform/data/tst_filedialog.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_folderdialog.qml b/tests/auto/platform/data/tst_folderdialog.qml
index 9aed6e67..5f44b995 100644
--- a/tests/auto/platform/data/tst_folderdialog.qml
+++ b/tests/auto/platform/data/tst_folderdialog.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_fontdialog.qml b/tests/auto/platform/data/tst_fontdialog.qml
index 493af4f0..8166964f 100644
--- a/tests/auto/platform/data/tst_fontdialog.qml
+++ b/tests/auto/platform/data/tst_fontdialog.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/platform/data/tst_menu.qml
index 06b9a30f..bb37c17b 100644
--- a/tests/auto/platform/data/tst_menu.qml
+++ b/tests/auto/platform/data/tst_menu.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_menubar.qml b/tests/auto/platform/data/tst_menubar.qml
index 662d6ff7..199c5010 100644
--- a/tests/auto/platform/data/tst_menubar.qml
+++ b/tests/auto/platform/data/tst_menubar.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/platform/data/tst_menuitem.qml
index 17097073..63d4989a 100644
--- a/tests/auto/platform/data/tst_menuitem.qml
+++ b/tests/auto/platform/data/tst_menuitem.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_menuitemgroup.qml b/tests/auto/platform/data/tst_menuitemgroup.qml
index cc9da352..c65150ca 100644
--- a/tests/auto/platform/data/tst_menuitemgroup.qml
+++ b/tests/auto/platform/data/tst_menuitemgroup.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_menuseparator.qml b/tests/auto/platform/data/tst_menuseparator.qml
index fb7688e3..29c48f6b 100644
--- a/tests/auto/platform/data/tst_menuseparator.qml
+++ b/tests/auto/platform/data/tst_menuseparator.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/platform/data/tst_messagedialog.qml
index cf51c27d..d5f2e21f 100644
--- a/tests/auto/platform/data/tst_messagedialog.qml
+++ b/tests/auto/platform/data/tst_messagedialog.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_standardpaths.qml b/tests/auto/platform/data/tst_standardpaths.qml
index 3f7d51d1..35f0d23b 100644
--- a/tests/auto/platform/data/tst_standardpaths.qml
+++ b/tests/auto/platform/data/tst_standardpaths.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0
diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml
index ea6f731a..675f08f3 100644
--- a/tests/auto/platform/data/tst_systemtrayicon.qml
+++ b/tests/auto/platform/data/tst_systemtrayicon.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
import Qt.labs.platform 1.0