aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickpopup/data
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/qquickpopup/data
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/qquickpopup/data')
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose1.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose2.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose3.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-wheel.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml4
-rw-r--r--tests/auto/qquickpopup/data/cursor.qml4
-rw-r--r--tests/auto/qquickpopup/data/grabber.qml4
-rw-r--r--tests/auto/qquickpopup/data/nested.qml4
-rw-r--r--tests/auto/qquickpopup/data/orientation.qml4
-rw-r--r--tests/auto/qquickpopup/data/window-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/window-wheel.qml4
-rw-r--r--tests/auto/qquickpopup/data/window.qml4
14 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
index ee0295c1..ed9b65e1 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
index cb215f9b..d089fbbb 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
index a8137b34..20bd7941 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/qquickpopup/data/applicationwindow-hover.qml
index 8cec6ba7..7b688147 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-hover.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow-hover.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
index a89bd0f6..de27d7ec 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickpopup/data/applicationwindow.qml b/tests/auto/qquickpopup/data/applicationwindow.qml
index 659aa843..3ce8a718 100644
--- a/tests/auto/qquickpopup/data/applicationwindow.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
index f41516c8..4f18fc13 100644
--- a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
+++ b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/cursor.qml b/tests/auto/qquickpopup/data/cursor.qml
index fd4475a0..4391f7a0 100644
--- a/tests/auto/qquickpopup/data/cursor.qml
+++ b/tests/auto/qquickpopup/data/cursor.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/grabber.qml b/tests/auto/qquickpopup/data/grabber.qml
index b9995b54..6a6d6d65 100644
--- a/tests/auto/qquickpopup/data/grabber.qml
+++ b/tests/auto/qquickpopup/data/grabber.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/nested.qml b/tests/auto/qquickpopup/data/nested.qml
index 48e51fc8..4ebdfb0c 100644
--- a/tests/auto/qquickpopup/data/nested.qml
+++ b/tests/auto/qquickpopup/data/nested.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/orientation.qml b/tests/auto/qquickpopup/data/orientation.qml
index cbf69b2b..a1cc9c0e 100644
--- a/tests/auto/qquickpopup/data/orientation.qml
+++ b/tests/auto/qquickpopup/data/orientation.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 600
diff --git a/tests/auto/qquickpopup/data/window-hover.qml b/tests/auto/qquickpopup/data/window-hover.qml
index 669afb08..0bf00660 100644
--- a/tests/auto/qquickpopup/data/window-hover.qml
+++ b/tests/auto/qquickpopup/data/window-hover.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 400
diff --git a/tests/auto/qquickpopup/data/window-wheel.qml b/tests/auto/qquickpopup/data/window-wheel.qml
index 45c09b45..37edee95 100644
--- a/tests/auto/qquickpopup/data/window-wheel.qml
+++ b/tests/auto/qquickpopup/data/window-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
id: window
diff --git a/tests/auto/qquickpopup/data/window.qml b/tests/auto/qquickpopup/data/window.qml
index 962ab573..0e15e838 100644
--- a/tests/auto/qquickpopup/data/window.qml
+++ b/tests/auto/qquickpopup/data/window.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 400