diff options
Diffstat (limited to 'tests')
79 files changed, 160 insertions, 160 deletions
diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml index 42f785ce4..a434beb2c 100644 --- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml +++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Item { diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml index d4e813019..c369619e3 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/applicationwindow/data/activefocusontab.qml @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 ApplicationWindow { diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml index 71bf9983f..194411dbf 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 ApplicationWindow { diff --git a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml index e3d69aa33..af7845190 100644 --- a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml +++ b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Column { diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml index 74f5a23bd..1c285de1c 100644 --- a/tests/auto/controls/data/rangemodel/rangemodel.qml +++ b/tests/auto/controls/data/rangemodel/rangemodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 diff --git a/tests/auto/controls/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml index daf111035..c0dd6cbcd 100644 --- a/tests/auto/controls/data/shortcut/shortcuts.qml +++ b/tests/auto/controls/data/shortcut/shortcuts.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Rectangle { diff --git a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml index 1244b4052..1c8b06b24 100644 --- a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml +++ b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml index eda5ee721..5f343ff97 100644 --- a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml +++ b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table3_qobjectlist.qml b/tests/auto/controls/data/tableview/table3_qobjectlist.qml index 1cfcc2a6a..9cd36cbb4 100644 --- a/tests/auto/controls/data/tableview/table3_qobjectlist.qml +++ b/tests/auto/controls/data/tableview/table3_qobjectlist.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table4_qstringlist.qml b/tests/auto/controls/data/tableview/table4_qstringlist.qml index 0d3284d44..61416ea1e 100644 --- a/tests/auto/controls/data/tableview/table4_qstringlist.qml +++ b/tests/auto/controls/data/tableview/table4_qstringlist.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table5_listmodel.qml b/tests/auto/controls/data/tableview/table5_listmodel.qml index 61ed542e8..b7ac4ca7b 100644 --- a/tests/auto/controls/data/tableview/table5_listmodel.qml +++ b/tests/auto/controls/data/tableview/table5_listmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml index 05d574351..cd2d26b07 100644 --- a/tests/auto/controls/data/tableview/table6_countmodel.qml +++ b/tests/auto/controls/data/tableview/table6_countmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml index 079f32134..00dd99c01 100644 --- a/tests/auto/controls/data/tableview/table7_arraymodel.qml +++ b/tests/auto/controls/data/tableview/table7_arraymodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml index 9022d8ff4..23c523faa 100644 --- a/tests/auto/controls/data/tableview/table8_itemmodel.qml +++ b/tests/auto/controls/data/tableview/table8_itemmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_activated.qml b/tests/auto/controls/data/tableview/table_activated.qml index 3b458837d..b4cd13aa2 100644 --- a/tests/auto/controls/data/tableview/table_activated.qml +++ b/tests/auto/controls/data/tableview/table_activated.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml b/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml index d0dc0079f..28b1198cf 100644 --- a/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml +++ b/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Item { diff --git a/tests/auto/controls/data/tableview/table_buttondelegate.qml b/tests/auto/controls/data/tableview/table_buttondelegate.qml index f683aeac0..93536bfe1 100644 --- a/tests/auto/controls/data/tableview/table_buttondelegate.qml +++ b/tests/auto/controls/data/tableview/table_buttondelegate.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_delegate2.qml b/tests/auto/controls/data/tableview/table_delegate2.qml index c9ad3d5ee..b55a4c6c2 100644 --- a/tests/auto/controls/data/tableview/table_delegate2.qml +++ b/tests/auto/controls/data/tableview/table_delegate2.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_delegate3.qml b/tests/auto/controls/data/tableview/table_delegate3.qml index e8922dd93..7d055df3c 100644 --- a/tests/auto/controls/data/tableview/table_delegate3.qml +++ b/tests/auto/controls/data/tableview/table_delegate3.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml index 421a1ce97..7709aea88 100644 --- a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml +++ b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_mousearea.qml b/tests/auto/controls/data/tableview/table_mousearea.qml index f63149ab5..e5fd598e5 100644 --- a/tests/auto/controls/data/tableview/table_mousearea.qml +++ b/tests/auto/controls/data/tableview/table_mousearea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_multicolumns.qml b/tests/auto/controls/data/tableview/table_multicolumns.qml index 58af9df6a..cb81523d0 100644 --- a/tests/auto/controls/data/tableview/table_multicolumns.qml +++ b/tests/auto/controls/data/tableview/table_multicolumns.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 TableView { diff --git a/tests/auto/controls/data/tableview/table_resizecolumns.qml b/tests/auto/controls/data/tableview/table_resizecolumns.qml index 95825d725..864270130 100644 --- a/tests/auto/controls/data/tableview/table_resizecolumns.qml +++ b/tests/auto/controls/data/tableview/table_resizecolumns.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1; +import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { diff --git a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml index 6b9760d04..788b272f2 100644 --- a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Row { diff --git a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml index 4f543fc1f..42a51d57b 100644 --- a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Row { diff --git a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml index 5b68153e3..ae454a736 100644 --- a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml +++ b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Row { diff --git a/tests/auto/controls/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml index 7450c705e..47e1c2186 100644 --- a/tests/auto/controls/data/tst_applicationwindow.qml +++ b/tests/auto/controls/data/tst_applicationwindow.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -55,7 +55,7 @@ TestCase { height:400 function test_minimumHeight() { - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ ApplicationWindow { \ visible: true; \ @@ -148,7 +148,7 @@ TestCase { } } - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ import QtQuick.Layouts 1.1; \ ApplicationWindow { \ @@ -169,7 +169,7 @@ TestCase { } function test_minimumSizeLargerThan_MaximumSize() { - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ import QtQuick.Layouts 1.1; \ ApplicationWindow { \ @@ -207,7 +207,7 @@ TestCase { } function test_defaultSizeHints() { - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ import QtQuick.Layouts 1.1; \ ApplicationWindow { \ diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml index 912ed7faf..c949788b5 100644 --- a/tests/auto/controls/data/tst_busyindicator.qml +++ b/tests/auto/controls/data/tst_busyindicator.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 Item { diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index ee555ac01..ad06045e4 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -79,7 +79,7 @@ TestCase { function test_action() { var test_actionStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ property var testAction: Action { \ @@ -126,7 +126,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index 278fb0e15..dc52238be 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -169,7 +169,7 @@ Item { } function test_check_keep_binding() { - var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + "Row { \n" + " property alias checkBox1: checkBox1 \n" + " property alias checkBox2: checkBox2 \n" @@ -188,7 +188,7 @@ Item { } function test_checkState_keep_binding() { - var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + "Row { \n" + " property alias checkBox1: checkBox1 \n" + " property alias checkBox2: checkBox2 \n" @@ -208,7 +208,7 @@ Item { function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + "Row { \n" + " property alias checkBox1: checkBox1 \n" + " property alias checkBox2: checkBox2 \n" @@ -281,7 +281,7 @@ Item { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 4d5117fbd..721284cf9 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -65,7 +65,7 @@ TestCase { } function init() { - model = Qt.createQmlObject("import QtQuick 2.1; ListModel {}", testCase, '') + model = Qt.createQmlObject("import QtQuick 2.2; ListModel {}", testCase, '') model.append({ text: "Banana", color: "Yellow" }) model.append({ text: "Apple", color: "Green" }) model.append({ text: "Coconut", color: "Brown" }) @@ -152,7 +152,7 @@ TestCase { } function test_validator() { - var comboBox = Qt.createQmlObject('import QtQuick 2.1; \ + var comboBox = Qt.createQmlObject('import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ ComboBox { \ editable: true; \ @@ -419,7 +419,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_gridlayout.qml b/tests/auto/controls/data/tst_gridlayout.qml index 7ca13b6b0..a595cca17 100644 --- a/tests/auto/controls/data/tst_gridlayout.qml +++ b/tests/auto/controls/data/tst_gridlayout.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Layouts 1.1 diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index d5986eb76..977527efa 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 @@ -95,14 +95,14 @@ TestCase { compare(groupbox.width, 16) compare(groupbox.height, 16) - var content = Qt.createQmlObject('import QtQuick 2.1; Rectangle {implicitWidth:100 ; implicitHeight:30}', container, '') + var content = Qt.createQmlObject('import QtQuick 2.2; Rectangle {implicitWidth:100 ; implicitHeight:30}', container, '') content.parent = groupbox.contentItem compare(groupbox.implicitWidth, 116) compare(groupbox.implicitHeight, 46) content.parent = null content.destroy() - content = Qt.createQmlObject('import QtQuick 2.1; Rectangle {width:20 ; height:20}', container, '') + content = Qt.createQmlObject('import QtQuick 2.2; Rectangle {width:20 ; height:20}', container, '') content.parent = groupbox.contentItem compare(groupbox.implicitWidth, 36) compare(groupbox.implicitHeight, 36) diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index c6d200490..4a6e296c4 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -63,7 +63,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_layout.qml b/tests/auto/controls/data/tst_layout.qml index 8ce582dbc..eac909425 100644 --- a/tests/auto/controls/data/tst_layout.qml +++ b/tests/auto/controls/data/tst_layout.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 TestCase { @@ -50,7 +50,7 @@ TestCase { function test_invalidParent() { ignoreWarning('Layout must be attached to Item elements') - var object = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Layouts 1.0; QtObject { Layout.fillWidth: true }', testCase, ''); + var object = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Layouts 1.0; QtObject { Layout.fillWidth: true }', testCase, ''); object.destroy() } } diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index d91580806..c53ae22c0 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml index 8f46108cd..4c2c25cf0 100644 --- a/tests/auto/controls/data/tst_menubar.qml +++ b/tests/auto/controls/data/tst_menubar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index b6b494fef..9f22300a3 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -134,7 +134,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index c8f759127..6a6efcd49 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -139,7 +139,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + "Row { \n" + " property alias radioButton1: radioButton1 \n" + " property alias radioButton2: radioButton2 \n" @@ -195,7 +195,7 @@ Item { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_rangemodel.qml b/tests/auto/controls/data/tst_rangemodel.qml index 2ba049263..bbb0e3bfb 100644 --- a/tests/auto/controls/data/tst_rangemodel.qml +++ b/tests/auto/controls/data/tst_rangemodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_rowlayout.qml b/tests/auto/controls/data/tst_rowlayout.qml index 9db6c803e..7daee7e8a 100644 --- a/tests/auto/controls/data/tst_rowlayout.qml +++ b/tests/auto/controls/data/tst_rowlayout.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Layouts 1.0 @@ -60,7 +60,7 @@ Item { function test_fixedAndExpanding() { var test_layoutStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Layouts 1.0; \ RowLayout { \ id: row; \ @@ -98,7 +98,7 @@ Item { function test_allExpanding() { var test_layoutStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Layouts 1.0; \ RowLayout { \ id: row; \ @@ -136,7 +136,7 @@ Item { function test_initialNestedLayouts() { var test_layoutStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Layouts 1.0; \ ColumnLayout { \ id : col; \ @@ -174,7 +174,7 @@ Item { function test_implicitSize() { var test_layoutStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Layouts 1.0; \ RowLayout { \ id: row; \ @@ -207,7 +207,7 @@ Item { function test_countGeometryChanges() { var test_layoutStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Layouts 1.0; \ ColumnLayout { \ id : col; \ diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index 16ebf6c20..7184ddb53 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 @@ -92,7 +92,7 @@ TestCase { function test_clickToCenter() { - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ import QtQuick.Controls.Styles 1.1; \ ScrollView { \ @@ -146,7 +146,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml index 106f9520b..5880e2102 100644 --- a/tests/auto/controls/data/tst_shortcuts.qml +++ b/tests/auto/controls/data/tst_shortcuts.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 57d79414c..f91363643 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -169,7 +169,7 @@ Item { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ @@ -239,7 +239,7 @@ Item { function test_updateValueWhileDragging() { var controlString = - 'import QtQuick 2.1 ; \ + 'import QtQuick 2.2 ; \ import QtQuick.Controls 1.1 ; \ import QtQuick.Controls.Styles 1.1; \ Slider { \ diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 4a01c6c27..40191db84 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 Item { @@ -354,7 +354,7 @@ Item { } function test_get_active_focus_when_up_or_down_was_pressed(){ - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Column { \ property alias spinbox: _spinbox; \ @@ -437,7 +437,7 @@ Item { } function test_activeFocusOnTab() { - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ @@ -589,7 +589,7 @@ Item { function test_construction() { // onValueChanged should not be emitted during construction. var root = Qt.createQmlObject(" - import QtQuick 2.1 + import QtQuick 2.2 import QtQuick.Controls 1.1 Item { id: root diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml index 6ba340272..b5311b038 100644 --- a/tests/auto/controls/data/tst_splitview.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/auto/controls/data/tst_stack.qml b/tests/auto/controls/data/tst_stack.qml index c06eda3f3..eb2b47d42 100644 --- a/tests/auto/controls/data/tst_stack.qml +++ b/tests/auto/controls/data/tst_stack.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 TestCase { @@ -49,17 +49,17 @@ TestCase { height:400 function test_index() { - var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property int index: Stack.index }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property int index: Stack.index }', testCase, ''); compare(item.index, -1); } function test_status() { - var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property int status: Stack.status }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property int status: Stack.status }', testCase, ''); compare(item.status, 0); // Stack.Inactive } function test_view() { - var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property StackView view: Stack.view }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property StackView view: Stack.view }', testCase, ''); compare(item.view, null); } } diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index e70cf458e..5e13acddb 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml index 65bd83b1e..23433db46 100644 --- a/tests/auto/controls/data/tst_statusbar.qml +++ b/tests/auto/controls/data/tst_statusbar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -63,7 +63,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_styles.qml b/tests/auto/controls/data/tst_styles.qml index c1af406dc..c86ba44ec 100644 --- a/tests/auto/controls/data/tst_styles.qml +++ b/tests/auto/controls/data/tst_styles.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 Item { @@ -55,112 +55,112 @@ Item { function test_createButtonStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: ButtonStyle {}}' , container, '') } function test_createToolButtonStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ Rectangle { width: 50; height: 50; property Component style: ToolButtonStyle {}}' , container, '') } function test_createCheckBoxStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: CheckBoxStyle {}}' , container, '') } function test_createComboBoxStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: ComboBoxStyle {}}' , container, '') } function test_createRadioButtonStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: RadioButtonStyle {}}' , container, '') } function test_createProgressBarStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: ProgressBarStyle {}}' , container, '') } function test_createSliderStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: SliderStyle {}}' , container, '') } function test_createTextFieldStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: TextFieldStyle {}}' , container, '') } function test_createSpinBoxStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: SpinBoxStyle {}}' , container, '') } function test_createToolBarStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: ToolBarStyle {}}' , container, '') } function test_createStatusBarStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: StatusBarStyle {}}' , container, '') } function test_createTableViewStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: TableViewStyle {}}' , container, '') } function test_createScrollViewStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: ScrollViewStyle {}}' , container, '') } function test_createGroupBoxStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ Rectangle { width: 50; height: 50; property Component style: GroupBoxStyle {}}' , container, '') } function test_createTabViewStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: TabViewStyle {}}' , container, '') } function test_createTextAreaStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: TextAreaStyle {}}' , container, '') } diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml index 27d669345..eb622abfd 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -115,7 +115,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + "Row { \n" + " property alias aSwitch1: aSwitch1 \n" + " property alias aSwitch2: aSwitch2 \n" @@ -187,7 +187,7 @@ Item { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml index cffe63b53..999f148a1 100644 --- a/tests/auto/controls/data/tst_tab.qml +++ b/tests/auto/controls/data/tst_tab.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 5dd46ae2c..73e1c8d2e 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 @@ -71,7 +71,7 @@ TestCase { function test_basic_setup() { var test_instanceStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ TableView { \ TableViewColumn { \ @@ -631,7 +631,7 @@ TestCase { } function test_columnWidth() { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var column = newColumn.createObject(testCase, {title: "title 1"}); verify(column.__view === null) @@ -640,7 +640,7 @@ TestCase { tableView.addColumn(column) compare(column.__view, tableView) compare(column.width, tableView.viewport.width) - var tableView2 = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView2 = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); ignoreWarning("TableView::insertColumn(): you cannot add a column to multiple views") tableView2.addColumn(column) // should not work compare(column.__view, tableView) //same as before @@ -662,7 +662,7 @@ TestCase { } function test_addRemoveColumn() { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) tableView.addColumn(newColumn.createObject(testCase, {title: "title 1"})) compare(tableView.columnCount, 1) @@ -740,7 +740,7 @@ TestCase { } function test_moveColumn(data) { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var titles = ["title 1", "title 2", "title 3"] @@ -774,7 +774,7 @@ TestCase { function test_positionViewAtRow() { var test_instanceStr = - 'import QtQuick 2.1; \ + 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ TableView { \ TableViewColumn { \ diff --git a/tests/auto/controls/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml index c471e40b2..a88b3c6ea 100644 --- a/tests/auto/controls/data/tst_tableviewcolumn.qml +++ b/tests/auto/controls/data/tst_tableviewcolumn.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml index 635680ac9..7c3b335f6 100644 --- a/tests/auto/controls/data/tst_tabview.qml +++ b/tests/auto/controls/data/tst_tabview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 Item { @@ -59,7 +59,7 @@ TestCase { } function test_repeater() { - var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { } } }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { } } }', testCase, ''); compare(tabView.count, 3) tabView.destroy() } @@ -70,7 +70,7 @@ TestCase { } function test_changeIndex() { - var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, ''); compare(tabView.count, 3) verify(tabView.getTab(1).item == undefined) tabView.currentIndex = 1 @@ -83,7 +83,7 @@ TestCase { function test_addRemoveTab() { - var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { }', testCase, ''); compare(tabView.count, 0) tabView.addTab("title 1", newTab) compare(tabView.count, 1) @@ -161,7 +161,7 @@ TestCase { } function test_moveTab(data) { - var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { }', testCase, ''); compare(tabView.count, 0) var titles = ["title 1", "title 2", "title 3"] @@ -193,7 +193,7 @@ TestCase { function test_dynamicTabs() { var test_tabView = ' \ - import QtQuick 2.1; \ + import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ TabView { \ id: tabView; \ @@ -225,7 +225,7 @@ TestCase { function test_dynamicModel() { var test_tabView = ' \ - import QtQuick 2.1; \ + import QtQuick 2.2; \ import QtQuick.Controls 1.0; \ TabView { \ id: tabView; \ @@ -246,7 +246,7 @@ TestCase { } function test_mousePressOnTabBar() { - var test_tabView = 'import QtQuick 2.1; \ + var test_tabView = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Column { \ property alias tabview: _tabview; \ diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 31239befa..3eced48cd 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 Item { @@ -81,7 +81,7 @@ TestCase { function test_activeFocusOnTab() { // Set TextArea readonly so the tab/backtab can be tested toward the navigation - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index c8f59b7f4..e7bd7d81d 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 Item { @@ -131,7 +131,7 @@ TestCase { } function test_validator() { - var textfield = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') textfield.text = "blu" compare(textfield.acceptableInput, false) @@ -292,7 +292,7 @@ TestCase { function test_activeFocusOnTab() { // Set TextField readonly so the tab/backtab can be tested toward the navigation - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index 60ca63138..a4d61415f 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -63,7 +63,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index 02ae5edef..9ffa17765 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtTest 1.0 import QtQuickControlsTests 1.0 @@ -76,7 +76,7 @@ TestCase { if (!SystemInfo.tabAllWidgets) skip("This function doesn't support NOT iterating all.") - var test_control = 'import QtQuick 2.1; \ + var test_control = 'import QtQuick 2.2; \ import QtQuick.Controls 1.1; \ Item { \ width: 200; \ diff --git a/tests/manual/ApplicationWindow/main.qml b/tests/manual/ApplicationWindow/main.qml index a9a64ac54..c4330da3f 100644 --- a/tests/manual/ApplicationWindow/main.qml +++ b/tests/manual/ApplicationWindow/main.qml @@ -42,7 +42,7 @@ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml index 1d68068f1..28e4b06f1 100644 --- a/tests/manual/ContextMenu.qml +++ b/tests/manual/ContextMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml index 78c783ea6..91cdba409 100644 --- a/tests/manual/Layout.qml +++ b/tests/manual/Layout.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/manual/StackView.qml b/tests/manual/StackView.qml index 8769e9a60..5c22072b5 100644 --- a/tests/manual/StackView.qml +++ b/tests/manual/StackView.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Window 2.1 import QtQuick.Controls 1.1 diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml index 7e6ef0f56..8b05721d5 100644 --- a/tests/manual/WindowContextMenu.qml +++ b/tests/manual/WindowContextMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Window 2.1 diff --git a/tests/manual/baselines/main.qml b/tests/manual/baselines/main.qml index d71930b4b..6edfdd683 100644 --- a/tests/manual/baselines/main.qml +++ b/tests/manual/baselines/main.qml @@ -42,7 +42,7 @@ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 diff --git a/tests/manual/combobox/main.qml b/tests/manual/combobox/main.qml index f0d1ab2de..55441c9a3 100644 --- a/tests/manual/combobox/main.qml +++ b/tests/manual/combobox/main.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/manual/keynavigation.qml b/tests/manual/keynavigation.qml index 55ddb4786..66fd4875d 100644 --- a/tests/manual/keynavigation.qml +++ b/tests/manual/keynavigation.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 0.1 ApplicationWindow { diff --git a/tests/manual/popupwindowkeyevents.qml b/tests/manual/popupwindowkeyevents.qml index 696d48d59..8b521c961 100644 --- a/tests/manual/popupwindowkeyevents.qml +++ b/tests/manual/popupwindowkeyevents.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml index 69baf8ba3..7c8b88916 100644 --- a/tests/manual/scrollview/main.qml +++ b/tests/manual/scrollview/main.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml index 768a9607e..aefcbc280 100644 --- a/tests/manual/splitter.qml +++ b/tests/manual/splitter.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 ApplicationWindow { diff --git a/tests/manual/stackview/ButtonMenu.qml b/tests/manual/stackview/ButtonMenu.qml index 355c76db6..684e026af 100644 --- a/tests/manual/stackview/ButtonMenu.qml +++ b/tests/manual/stackview/ButtonMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/manual/stackview/View.qml b/tests/manual/stackview/View.qml index ec844c907..f5872a473 100644 --- a/tests/manual/stackview/View.qml +++ b/tests/manual/stackview/View.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/manual/stackview/main.qml b/tests/manual/stackview/main.qml index caf30f80c..f93bd7fa3 100644 --- a/tests/manual/stackview/main.qml +++ b/tests/manual/stackview/main.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml index 29ee0599a..c8c5b73a5 100644 --- a/tests/manual/stretching.qml +++ b/tests/manual/stretching.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml index b21162f3c..d06e87801 100644 --- a/tests/manual/stretchingcustom.qml +++ b/tests/manual/stretchingcustom.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml index d8130a5cf..9bc0a0b92 100644 --- a/tests/manual/tableviewmodels/qml/main.qml +++ b/tests/manual/tableviewmodels/qml/main.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 Rectangle { diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml index a7cb51bc8..60b2cec06 100644 --- a/tests/manual/testbench/content/Components.qml +++ b/tests/manual/testbench/content/Components.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml index 2f7718aff..31cb5d77f 100644 --- a/tests/manual/testbench/content/PropertyLayouts.qml +++ b/tests/manual/testbench/content/PropertyLayouts.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index 929b19376..87f7a71be 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -263,7 +263,7 @@ ApplicationWindow { case "horizontalAlignment": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft}); enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight}); @@ -272,7 +272,7 @@ ApplicationWindow { case "textFormat": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText}); enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText}); @@ -281,7 +281,7 @@ ApplicationWindow { case "verticalAlignment": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop}); enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom}); @@ -290,7 +290,7 @@ ApplicationWindow { case "textFormat": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText}); enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText}); @@ -299,7 +299,7 @@ ApplicationWindow { case "inputMethodHints": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone}); enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText}); @@ -322,7 +322,7 @@ ApplicationWindow { case "orientation": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal}); enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical}); @@ -330,7 +330,7 @@ ApplicationWindow { case "echoMode": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal}); enumModelData.append({ text: "TextInput.Password", value: TextInput.Password}); @@ -342,7 +342,7 @@ ApplicationWindow { case "textColor": isColor = true layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Amber", value: "#FF7E00"}); enumModelData.append({ text: "Azure", value: "#007FFF"}); @@ -351,7 +351,7 @@ ApplicationWindow { case "sortIndicatorOrder": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.AscendingOrder", value: Qt.AscendingOrder}); enumModelData.append({ text: "Qt.DescendingOrder", value: Qt.DescendingOrder}); @@ -359,7 +359,7 @@ ApplicationWindow { case "checkedState": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.Checked", value: Qt.Checked}); enumModelData.append({ text: "Qt.Unchecked", value: Qt.Unchecked}); |