aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/controls
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/controls
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/controls')
-rw-r--r--tests/auto/controls/data/SignalSequenceSpy.qml2
-rw-r--r--tests/auto/controls/data/TestItem.qml2
-rw-r--r--tests/auto/controls/data/TumblerDatePicker.qml4
-rw-r--r--tests/auto/controls/data/TumblerListView.qml4
-rw-r--r--tests/auto/controls/data/TumblerPathView.qml4
-rw-r--r--tests/auto/controls/data/tst_abstractbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_action.qml6
-rw-r--r--tests/auto/controls/data/tst_actiongroup.qml4
-rw-r--r--tests/auto/controls/data/tst_busyindicator.qml4
-rw-r--r--tests/auto/controls/data/tst_button.qml4
-rw-r--r--tests/auto/controls/data/tst_buttongroup.qml4
-rw-r--r--tests/auto/controls/data/tst_checkbox.qml4
-rw-r--r--tests/auto/controls/data/tst_checkdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_combobox.qml4
-rw-r--r--tests/auto/controls/data/tst_container.qml6
-rw-r--r--tests/auto/controls/data/tst_control.qml6
-rw-r--r--tests/auto/controls/data/tst_delaybutton.qml4
-rw-r--r--tests/auto/controls/data/tst_dial.qml4
-rw-r--r--tests/auto/controls/data/tst_dialog.qml6
-rw-r--r--tests/auto/controls/data/tst_dialogbuttonbox.qml4
-rw-r--r--tests/auto/controls/data/tst_frame.qml4
-rw-r--r--tests/auto/controls/data/tst_groupbox.qml4
-rw-r--r--tests/auto/controls/data/tst_itemdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_label.qml4
-rw-r--r--tests/auto/controls/data/tst_menuitem.qml4
-rw-r--r--tests/auto/controls/data/tst_page.qml4
-rw-r--r--tests/auto/controls/data/tst_pageindicator.qml4
-rw-r--r--tests/auto/controls/data/tst_pane.qml4
-rw-r--r--tests/auto/controls/data/tst_popup.qml4
-rw-r--r--tests/auto/controls/data/tst_progressbar.qml4
-rw-r--r--tests/auto/controls/data/tst_radiobutton.qml4
-rw-r--r--tests/auto/controls/data/tst_radiodelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_rangeslider.qml4
-rw-r--r--tests/auto/controls/data/tst_roundbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_scrollbar.qml4
-rw-r--r--tests/auto/controls/data/tst_scrollindicator.qml4
-rw-r--r--tests/auto/controls/data/tst_scrollview.qml4
-rw-r--r--tests/auto/controls/data/tst_slider.qml4
-rw-r--r--tests/auto/controls/data/tst_spinbox.qml6
-rw-r--r--tests/auto/controls/data/tst_stackview.qml4
-rw-r--r--tests/auto/controls/data/tst_swipedelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_swipeview.qml4
-rw-r--r--tests/auto/controls/data/tst_switch.qml4
-rw-r--r--tests/auto/controls/data/tst_switchdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_tabbar.qml4
-rw-r--r--tests/auto/controls/data/tst_tabbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_textarea.qml4
-rw-r--r--tests/auto/controls/data/tst_textfield.qml4
-rw-r--r--tests/auto/controls/data/tst_toolbar.qml4
-rw-r--r--tests/auto/controls/data/tst_toolbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_toolseparator.qml4
-rw-r--r--tests/auto/controls/data/tst_tooltip.qml4
-rw-r--r--tests/auto/controls/data/tst_tumbler.qml4
-rw-r--r--tests/auto/controls/default/dependencies.qml4
-rw-r--r--tests/auto/controls/fusion/dependencies.qml6
-rw-r--r--tests/auto/controls/imagine/dependencies.qml6
-rw-r--r--tests/auto/controls/material/dependencies.qml6
-rw-r--r--tests/auto/controls/universal/dependencies.qml6
58 files changed, 123 insertions, 123 deletions
diff --git a/tests/auto/controls/data/SignalSequenceSpy.qml b/tests/auto/controls/data/SignalSequenceSpy.qml
index d14a5ee6..531a7f68 100644
--- a/tests/auto/controls/data/SignalSequenceSpy.qml
+++ b/tests/auto/controls/data/SignalSequenceSpy.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.5
+import QtQuick 2.12
QtObject {
property QtObject target: null
diff --git a/tests/auto/controls/data/TestItem.qml b/tests/auto/controls/data/TestItem.qml
index b7c16004..6bd42bac 100644
--- a/tests/auto/controls/data/TestItem.qml
+++ b/tests/auto/controls/data/TestItem.qml
@@ -48,7 +48,7 @@
**
****************************************************************************/
-import QtQuick 2.5
+import QtQuick 2.12
Item {
id: item
diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml
index 72e57bed..01ff2c03 100644
--- a/tests/auto/controls/data/TumblerDatePicker.qml
+++ b/tests/auto/controls/data/TumblerDatePicker.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
Row {
id: datePicker
diff --git a/tests/auto/controls/data/TumblerListView.qml b/tests/auto/controls/data/TumblerListView.qml
index 1248bec0..affaa6cd 100644
--- a/tests/auto/controls/data/TumblerListView.qml
+++ b/tests/auto/controls/data/TumblerListView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ListView {
anchors.fill: parent
diff --git a/tests/auto/controls/data/TumblerPathView.qml b/tests/auto/controls/data/TumblerPathView.qml
index 7b7cd5f4..8ea86eae 100644
--- a/tests/auto/controls/data/TumblerPathView.qml
+++ b/tests/auto/controls/data/TumblerPathView.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
PathView {
id: pathView
diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml
index 1ed5e45d..7bfa17c5 100644
--- a/tests/auto/controls/data/tst_abstractbutton.qml
+++ b/tests/auto/controls/data/tst_abstractbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml
index 35e65202..ef28c0e5 100644
--- a/tests/auto/controls/data/tst_action.qml
+++ b/tests/auto/controls/data/tst_action.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.3
-import QtQuick.Templates 2.3 as T
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_actiongroup.qml b/tests/auto/controls/data/tst_actiongroup.qml
index 700d247a..6c8ea5c4 100644
--- a/tests/auto/controls/data/tst_actiongroup.qml
+++ b/tests/auto/controls/data/tst_actiongroup.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml
index 3de8c795..7801cdab 100644
--- a/tests/auto/controls/data/tst_busyindicator.qml
+++ b/tests/auto/controls/data/tst_busyindicator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 2cf399f4..bd4fe80e 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/controls/data/tst_buttongroup.qml
index 1b7fa4a3..1abb9795 100644
--- a/tests/auto/controls/data/tst_buttongroup.qml
+++ b/tests/auto/controls/data/tst_buttongroup.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.3
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 3fb7d15e..1f00294f 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml
index 72b45251..0c0565f1 100644
--- a/tests/auto/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/controls/data/tst_checkdelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 8e8f9c2f..70c4f090 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtQuick.Window 2.2
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml
index c5e74eeb..134dbb38 100644
--- a/tests/auto/controls/data/tst_container.qml
+++ b/tests/auto/controls/data/tst_container.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Templates 2.2 as T
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml
index 5c66bd04..3c416546 100644
--- a/tests/auto/controls/data/tst_control.qml
+++ b/tests/auto/controls/data/tst_control.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Templates 2.2 as T
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml
index 97ae0272..2560177d 100644
--- a/tests/auto/controls/data/tst_delaybutton.qml
+++ b/tests/auto/controls/data/tst_delaybutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml
index a2d32347..cd2f6112 100644
--- a/tests/auto/controls/data/tst_dial.qml
+++ b/tests/auto/controls/data/tst_dial.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml
index e2557a04..22546083 100644
--- a/tests/auto/controls/data/tst_dialog.qml
+++ b/tests/auto/controls/data/tst_dialog.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Templates 2.2 as T
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml
index ed181c5b..43153c94 100644
--- a/tests/auto/controls/data/tst_dialogbuttonbox.qml
+++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml
index 95838155..a5236b71 100644
--- a/tests/auto/controls/data/tst_frame.qml
+++ b/tests/auto/controls/data/tst_frame.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml
index 446283d8..a4f1b5f3 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/controls/data/tst_groupbox.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml
index 4e4ca0c4..1c236361 100644
--- a/tests/auto/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/controls/data/tst_itemdelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index 8183f088..8384e932 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml
index 57286002..27c23ae5 100644
--- a/tests/auto/controls/data/tst_menuitem.qml
+++ b/tests/auto/controls/data/tst_menuitem.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml
index c709c216..252c6ebf 100644
--- a/tests/auto/controls/data/tst_page.qml
+++ b/tests/auto/controls/data/tst_page.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml
index dc411e45..0f68b5d8 100644
--- a/tests/auto/controls/data/tst_pageindicator.qml
+++ b/tests/auto/controls/data/tst_pageindicator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/controls/data/tst_pane.qml
index 8976d4f9..4006474b 100644
--- a/tests/auto/controls/data/tst_pane.qml
+++ b/tests/auto/controls/data/tst_pane.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index 962feae2..27043d1c 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -50,8 +50,8 @@
import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.5
-import QtQuick.Templates 2.5 as T
+import QtQuick.Controls 2.12
+import QtQuick.Templates 2.12 as T
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index f3648495..74840551 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 0d18bf01..c16f615c 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml
index b1ee00db..ff11fffb 100644
--- a/tests/auto/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/controls/data/tst_radiodelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml
index 03b34a2a..24f8a207 100644
--- a/tests/auto/controls/data/tst_rangeslider.qml
+++ b/tests/auto/controls/data/tst_rangeslider.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml
index c772c85f..5f4cc5fa 100644
--- a/tests/auto/controls/data/tst_roundbutton.qml
+++ b/tests/auto/controls/data/tst_roundbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml
index 90fe9468..0051b785 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/controls/data/tst_scrollbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml
index 9435ec3b..c23bf3e5 100644
--- a/tests/auto/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/controls/data/tst_scrollindicator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 80110b5a..7581b8c6 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 368bc9fd..2b3144a5 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 47c19f40..419478a2 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -48,10 +48,10 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
-import QtQuick.Window 2.3
+import QtQuick.Controls 2.12
+import QtQuick.Window 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index 3827354b..a9fbf874 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 1668dc84..3e2ff460 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml
index 1f92bba4..38af37f7 100644
--- a/tests/auto/controls/data/tst_swipeview.qml
+++ b/tests/auto/controls/data/tst_swipeview.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
index 079bf820..b3fab41c 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/controls/data/tst_switch.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index 187a61bd..1c96023f 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml
index 58917d84..519b1d53 100644
--- a/tests/auto/controls/data/tst_tabbar.qml
+++ b/tests/auto/controls/data/tst_tabbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml
index 3cb22ecd..96384769 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/controls/data/tst_tabbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index 0a50e033..ee40c9b7 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 963046e4..ee2d1a54 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index c0f0845c..09c3a830 100644
--- a/tests/auto/controls/data/tst_toolbar.qml
+++ b/tests/auto/controls/data/tst_toolbar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 9e79cb8c..622554c7 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_toolseparator.qml b/tests/auto/controls/data/tst_toolseparator.qml
index d210dc6d..d3581b96 100644
--- a/tests/auto/controls/data/tst_toolseparator.qml
+++ b/tests/auto/controls/data/tst_toolseparator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.8
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index 99b6ee14..8a855ce0 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index 18f63ed4..7c2095f8 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.12
import QtTest 1.0
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2.12
TestCase {
id: testCase
diff --git a/tests/auto/controls/default/dependencies.qml b/tests/auto/controls/default/dependencies.qml
index 61cd0f17..7ffafb84 100644
--- a/tests/auto/controls/default/dependencies.qml
+++ b/tests/auto/controls/default/dependencies.qml
@@ -1,5 +1,5 @@
import QtTest 1.0
-import QtQuick 2.6
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
TestCase { }
diff --git a/tests/auto/controls/fusion/dependencies.qml b/tests/auto/controls/fusion/dependencies.qml
index 30c32fa5..2da1b2bb 100644
--- a/tests/auto/controls/fusion/dependencies.qml
+++ b/tests/auto/controls/fusion/dependencies.qml
@@ -1,6 +1,6 @@
import QtTest 1.0
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Fusion 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Fusion 2.12
TestCase { }
diff --git a/tests/auto/controls/imagine/dependencies.qml b/tests/auto/controls/imagine/dependencies.qml
index 3811fec0..e681aa4f 100644
--- a/tests/auto/controls/imagine/dependencies.qml
+++ b/tests/auto/controls/imagine/dependencies.qml
@@ -1,6 +1,6 @@
import QtTest 1.0
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Imagine 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Imagine 2.12
TestCase { }
diff --git a/tests/auto/controls/material/dependencies.qml b/tests/auto/controls/material/dependencies.qml
index 5eda844b..f926944e 100644
--- a/tests/auto/controls/material/dependencies.qml
+++ b/tests/auto/controls/material/dependencies.qml
@@ -1,6 +1,6 @@
import QtTest 1.0
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
TestCase { }
diff --git a/tests/auto/controls/universal/dependencies.qml b/tests/auto/controls/universal/dependencies.qml
index 67c54871..a4a0d0a0 100644
--- a/tests/auto/controls/universal/dependencies.qml
+++ b/tests/auto/controls/universal/dependencies.qml
@@ -1,6 +1,6 @@
import QtTest 1.0
-import QtQuick 2.6
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Universal 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Controls.Universal 2.12
TestCase { }