aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickapplicationwindow
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/qquickapplicationwindow
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/qquickapplicationwindow')
-rw-r--r--tests/auto/qquickapplicationwindow/data/activeFocusControl.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/activefocusontab.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/attachedProperties.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml8
-rw-r--r--tests/auto/qquickapplicationwindow/data/defaultFocus.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/fill.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/font.qml6
-rw-r--r--tests/auto/qquickapplicationwindow/data/layout.qml4
-rw-r--r--tests/auto/qquickapplicationwindow/data/locale.qml6
11 files changed, 26 insertions, 26 deletions
diff --git a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
index 940e8e08..743ae16d 100644
--- a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml
+++ b/tests/auto/qquickapplicationwindow/data/activeFocusControl.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/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
index 357ea9a4..45b3d1e3 100644
--- a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
+++ b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
index 09bc47ef..53a139c1 100644
--- a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
+++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.12
ApplicationWindow {
property alias childControl: childControl
diff --git a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
index 16182f59..a9412fd6 100644
--- a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
index a992e0be..d3218998 100644
--- a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
+++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.7
-import QtQuick.Controls 2.1
-import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
+import QtGraphicalEffects 1.12
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
index 741ce908..5dff2b6c 100644
--- a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
+++ b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
visible: true
diff --git a/tests/auto/qquickapplicationwindow/data/fill.qml b/tests/auto/qquickapplicationwindow/data/fill.qml
index 27b10d34..d29ed0f9 100644
--- a/tests/auto/qquickapplicationwindow/data/fill.qml
+++ b/tests/auto/qquickapplicationwindow/data/fill.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/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
index f0499a3a..313bbb5f 100644
--- a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml
+++ b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.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: 200
diff --git a/tests/auto/qquickapplicationwindow/data/font.qml b/tests/auto/qquickapplicationwindow/data/font.qml
index a675aeab..8bde4bf1 100644
--- a/tests/auto/qquickapplicationwindow/data/font.qml
+++ b/tests/auto/qquickapplicationwindow/data/font.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
ApplicationWindow {
objectName: "appWin"
diff --git a/tests/auto/qquickapplicationwindow/data/layout.qml b/tests/auto/qquickapplicationwindow/data/layout.qml
index 5bcffdf1..dc840443 100644
--- a/tests/auto/qquickapplicationwindow/data/layout.qml
+++ b/tests/auto/qquickapplicationwindow/data/layout.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 200
diff --git a/tests/auto/qquickapplicationwindow/data/locale.qml b/tests/auto/qquickapplicationwindow/data/locale.qml
index 92edb53a..5efb948f 100644
--- a/tests/auto/qquickapplicationwindow/data/locale.qml
+++ b/tests/auto/qquickapplicationwindow/data/locale.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
ApplicationWindow {
objectName: "appWin"