aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual/testbench/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/manual/testbench/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/manual/testbench/controls')
-rw-r--r--tests/manual/testbench/controls/BusyIndicator.qml4
-rw-r--r--tests/manual/testbench/controls/Button.qml4
-rw-r--r--tests/manual/testbench/controls/CheckBox.qml4
-rw-r--r--tests/manual/testbench/controls/CheckDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/ComboBox.qml4
-rw-r--r--tests/manual/testbench/controls/DelayButton.qml4
-rw-r--r--tests/manual/testbench/controls/Dial.qml4
-rw-r--r--tests/manual/testbench/controls/Dialog.qml6
-rw-r--r--tests/manual/testbench/controls/Frame.qml4
-rw-r--r--tests/manual/testbench/controls/GroupBox.qml4
-rw-r--r--tests/manual/testbench/controls/ItemDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/Label.qml4
-rw-r--r--tests/manual/testbench/controls/Menu.qml6
-rw-r--r--tests/manual/testbench/controls/MenuBar.qml4
-rw-r--r--tests/manual/testbench/controls/Page.qml4
-rw-r--r--tests/manual/testbench/controls/PageIndicator.qml6
-rw-r--r--tests/manual/testbench/controls/Pane.qml4
-rw-r--r--tests/manual/testbench/controls/ProgressBar.qml4
-rw-r--r--tests/manual/testbench/controls/RadioButton.qml4
-rw-r--r--tests/manual/testbench/controls/RadioDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/RangeSlider.qml4
-rw-r--r--tests/manual/testbench/controls/RoundButton.qml4
-rw-r--r--tests/manual/testbench/controls/ScrollBar.qml4
-rw-r--r--tests/manual/testbench/controls/ScrollIndicator.qml4
-rw-r--r--tests/manual/testbench/controls/Slider.qml4
-rw-r--r--tests/manual/testbench/controls/SpinBox.qml4
-rw-r--r--tests/manual/testbench/controls/SwipeDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/Switch.qml4
-rw-r--r--tests/manual/testbench/controls/SwitchDelegate.qml4
-rw-r--r--tests/manual/testbench/controls/TabBar.qml4
-rw-r--r--tests/manual/testbench/controls/TextArea.qml4
-rw-r--r--tests/manual/testbench/controls/TextField.qml4
-rw-r--r--tests/manual/testbench/controls/ToolBar.qml6
-rw-r--r--tests/manual/testbench/controls/ToolTip.qml6
-rw-r--r--tests/manual/testbench/controls/Tumbler.qml6
35 files changed, 76 insertions, 76 deletions
diff --git a/tests/manual/testbench/controls/BusyIndicator.qml b/tests/manual/testbench/controls/BusyIndicator.qml
index 97456a93..22b3d98a 100644
--- a/tests/manual/testbench/controls/BusyIndicator.qml
+++ b/tests/manual/testbench/controls/BusyIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Button.qml b/tests/manual/testbench/controls/Button.qml
index b1152481..44ddfee0 100644
--- a/tests/manual/testbench/controls/Button.qml
+++ b/tests/manual/testbench/controls/Button.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/CheckBox.qml b/tests/manual/testbench/controls/CheckBox.qml
index 73f94857..b79d800d 100644
--- a/tests/manual/testbench/controls/CheckBox.qml
+++ b/tests/manual/testbench/controls/CheckBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/CheckDelegate.qml b/tests/manual/testbench/controls/CheckDelegate.qml
index b742b170..c8089fab 100644
--- a/tests/manual/testbench/controls/CheckDelegate.qml
+++ b/tests/manual/testbench/controls/CheckDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/ComboBox.qml b/tests/manual/testbench/controls/ComboBox.qml
index c9b8498f..335eeb56 100644
--- a/tests/manual/testbench/controls/ComboBox.qml
+++ b/tests/manual/testbench/controls/ComboBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/DelayButton.qml b/tests/manual/testbench/controls/DelayButton.qml
index af52e067..ae887ef3 100644
--- a/tests/manual/testbench/controls/DelayButton.qml
+++ b/tests/manual/testbench/controls/DelayButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Dial.qml b/tests/manual/testbench/controls/Dial.qml
index 5dc8c356..06b91076 100644
--- a/tests/manual/testbench/controls/Dial.qml
+++ b/tests/manual/testbench/controls/Dial.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Dialog.qml b/tests/manual/testbench/controls/Dialog.qml
index 7b8eb720..52aa923e 100644
--- a/tests/manual/testbench/controls/Dialog.qml
+++ b/tests/manual/testbench/controls/Dialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
// TODO
QtObject {
diff --git a/tests/manual/testbench/controls/Frame.qml b/tests/manual/testbench/controls/Frame.qml
index c0348025..c7b176fb 100644
--- a/tests/manual/testbench/controls/Frame.qml
+++ b/tests/manual/testbench/controls/Frame.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/GroupBox.qml b/tests/manual/testbench/controls/GroupBox.qml
index a99a998a..eda7ad79 100644
--- a/tests/manual/testbench/controls/GroupBox.qml
+++ b/tests/manual/testbench/controls/GroupBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/ItemDelegate.qml b/tests/manual/testbench/controls/ItemDelegate.qml
index 44882df9..8cf348d4 100644
--- a/tests/manual/testbench/controls/ItemDelegate.qml
+++ b/tests/manual/testbench/controls/ItemDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Label.qml b/tests/manual/testbench/controls/Label.qml
index c0d980e8..92192e09 100644
--- a/tests/manual/testbench/controls/Label.qml
+++ b/tests/manual/testbench/controls/Label.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Menu.qml b/tests/manual/testbench/controls/Menu.qml
index c449dd47..3bb54009 100644
--- a/tests/manual/testbench/controls/Menu.qml
+++ b/tests/manual/testbench/controls/Menu.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
// TODO
QtObject {
diff --git a/tests/manual/testbench/controls/MenuBar.qml b/tests/manual/testbench/controls/MenuBar.qml
index 00db9af1..77a7da2b 100644
--- a/tests/manual/testbench/controls/MenuBar.qml
+++ b/tests/manual/testbench/controls/MenuBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
// TODO
QtObject {
diff --git a/tests/manual/testbench/controls/Page.qml b/tests/manual/testbench/controls/Page.qml
index 117359f9..add9cc09 100644
--- a/tests/manual/testbench/controls/Page.qml
+++ b/tests/manual/testbench/controls/Page.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/PageIndicator.qml b/tests/manual/testbench/controls/PageIndicator.qml
index e8d3f570..60094e4d 100644
--- a/tests/manual/testbench/controls/PageIndicator.qml
+++ b/tests/manual/testbench/controls/PageIndicator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Pane.qml b/tests/manual/testbench/controls/Pane.qml
index d39adff4..c8b6c699 100644
--- a/tests/manual/testbench/controls/Pane.qml
+++ b/tests/manual/testbench/controls/Pane.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/ProgressBar.qml b/tests/manual/testbench/controls/ProgressBar.qml
index 1fdb02b2..67047178 100644
--- a/tests/manual/testbench/controls/ProgressBar.qml
+++ b/tests/manual/testbench/controls/ProgressBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/RadioButton.qml b/tests/manual/testbench/controls/RadioButton.qml
index b1a10e0f..b1fff6dc 100644
--- a/tests/manual/testbench/controls/RadioButton.qml
+++ b/tests/manual/testbench/controls/RadioButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/RadioDelegate.qml b/tests/manual/testbench/controls/RadioDelegate.qml
index fcae84f7..e449744c 100644
--- a/tests/manual/testbench/controls/RadioDelegate.qml
+++ b/tests/manual/testbench/controls/RadioDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/RangeSlider.qml b/tests/manual/testbench/controls/RangeSlider.qml
index debd097c..b3d84e53 100644
--- a/tests/manual/testbench/controls/RangeSlider.qml
+++ b/tests/manual/testbench/controls/RangeSlider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/RoundButton.qml b/tests/manual/testbench/controls/RoundButton.qml
index 6a2bb5c2..5d066133 100644
--- a/tests/manual/testbench/controls/RoundButton.qml
+++ b/tests/manual/testbench/controls/RoundButton.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/ScrollBar.qml b/tests/manual/testbench/controls/ScrollBar.qml
index f59796d2..25c7f4d6 100644
--- a/tests/manual/testbench/controls/ScrollBar.qml
+++ b/tests/manual/testbench/controls/ScrollBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/ScrollIndicator.qml b/tests/manual/testbench/controls/ScrollIndicator.qml
index 32c66aad..2c6fd4a9 100644
--- a/tests/manual/testbench/controls/ScrollIndicator.qml
+++ b/tests/manual/testbench/controls/ScrollIndicator.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Slider.qml b/tests/manual/testbench/controls/Slider.qml
index d2a272fa..831f4778 100644
--- a/tests/manual/testbench/controls/Slider.qml
+++ b/tests/manual/testbench/controls/Slider.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/SpinBox.qml b/tests/manual/testbench/controls/SpinBox.qml
index 77094dc0..0fdfb9fe 100644
--- a/tests/manual/testbench/controls/SpinBox.qml
+++ b/tests/manual/testbench/controls/SpinBox.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/SwipeDelegate.qml b/tests/manual/testbench/controls/SwipeDelegate.qml
index 6143a50f..141435d8 100644
--- a/tests/manual/testbench/controls/SwipeDelegate.qml
+++ b/tests/manual/testbench/controls/SwipeDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Switch.qml b/tests/manual/testbench/controls/Switch.qml
index 63051a50..6df1a0e0 100644
--- a/tests/manual/testbench/controls/Switch.qml
+++ b/tests/manual/testbench/controls/Switch.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/SwitchDelegate.qml b/tests/manual/testbench/controls/SwitchDelegate.qml
index 4cb42105..ac4a322a 100644
--- a/tests/manual/testbench/controls/SwitchDelegate.qml
+++ b/tests/manual/testbench/controls/SwitchDelegate.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/TabBar.qml b/tests/manual/testbench/controls/TabBar.qml
index 4e6440d3..7e98eb93 100644
--- a/tests/manual/testbench/controls/TabBar.qml
+++ b/tests/manual/testbench/controls/TabBar.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
// TODO
QtObject {
diff --git a/tests/manual/testbench/controls/TextArea.qml b/tests/manual/testbench/controls/TextArea.qml
index 8f2493f4..ae3cf08b 100644
--- a/tests/manual/testbench/controls/TextArea.qml
+++ b/tests/manual/testbench/controls/TextArea.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/TextField.qml b/tests/manual/testbench/controls/TextField.qml
index 7ecd21b2..b9a5bfb8 100644
--- a/tests/manual/testbench/controls/TextField.qml
+++ b/tests/manual/testbench/controls/TextField.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/ToolBar.qml b/tests/manual/testbench/controls/ToolBar.qml
index 7ce40218..ec80ebe7 100644
--- a/tests/manual/testbench/controls/ToolBar.qml
+++ b/tests/manual/testbench/controls/ToolBar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
// TODO
QtObject {
diff --git a/tests/manual/testbench/controls/ToolTip.qml b/tests/manual/testbench/controls/ToolTip.qml
index 19ae9dd1..3e3a017b 100644
--- a/tests/manual/testbench/controls/ToolTip.qml
+++ b/tests/manual/testbench/controls/ToolTip.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
QtObject {
property var supportedStates: [
diff --git a/tests/manual/testbench/controls/Tumbler.qml b/tests/manual/testbench/controls/Tumbler.qml
index 0d64ff3b..f10af24e 100644
--- a/tests/manual/testbench/controls/Tumbler.qml
+++ b/tests/manual/testbench/controls/Tumbler.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+import QtQuick.Layouts 1.12
QtObject {
property var supportedStates: [