diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-08-30 12:13:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 11:20:29 +0200 |
| commit | 0e4a9eba4052c4ad447b06c4575c30f77b4f3237 (patch) | |
| tree | c56717ed57ce17ac96cde788b1c92e4879375428 /tests/auto | |
| parent | 37b0b8176537923ec77621c114e8ac2deb307b33 (diff) | |
| download | qtquickcontrols-0e4a9eba4052c4ad447b06c4575c30f77b4f3237.tar.gz | |
Update imports to 1.1 and remove version from qmlmodule definition
Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/auto')
50 files changed, 162 insertions, 162 deletions
diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml index 20f1a77f..210d377c 100644 --- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml +++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 Item { id: main diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml index bd4c4826..d4e81301 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/applicationwindow/data/activefocusontab.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml index e19648ae..71bf9983 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml index 6d1956fb..e3d69aa3 100644 --- a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml +++ b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 Column { width: 200 diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml index 2320e240..74f5a23b 100644 --- a/tests/auto/controls/data/rangemodel/rangemodel.qml +++ b/tests/auto/controls/data/rangemodel/rangemodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 RangeModel { diff --git a/tests/auto/controls/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml index c9c6f5f5..56096dee 100644 --- a/tests/auto/controls/data/shortcut/shortcuts.qml +++ b/tests/auto/controls/data/shortcut/shortcuts.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 Rectangle { width: 300 diff --git a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml index f058de00..1244b405 100644 --- a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml +++ b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml index 514a57c8..eda5ee72 100644 --- a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml +++ b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table3_qobjectlist.qml b/tests/auto/controls/data/tableview/table3_qobjectlist.qml index 76008e8f..1cfcc2a6 100644 --- a/tests/auto/controls/data/tableview/table3_qobjectlist.qml +++ b/tests/auto/controls/data/tableview/table3_qobjectlist.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table4_qstringlist.qml b/tests/auto/controls/data/tableview/table4_qstringlist.qml index 94f86156..0d3284d4 100644 --- a/tests/auto/controls/data/tableview/table4_qstringlist.qml +++ b/tests/auto/controls/data/tableview/table4_qstringlist.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table5_listmodel.qml b/tests/auto/controls/data/tableview/table5_listmodel.qml index e8074201..61ed542e 100644 --- a/tests/auto/controls/data/tableview/table5_listmodel.qml +++ b/tests/auto/controls/data/tableview/table5_listmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { currentRow: 0 diff --git a/tests/auto/controls/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml index 4a7073d4..05d57435 100644 --- a/tests/auto/controls/data/tableview/table6_countmodel.qml +++ b/tests/auto/controls/data/tableview/table6_countmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { model: 3 // qml diff --git a/tests/auto/controls/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml index d794e170..079f3213 100644 --- a/tests/auto/controls/data/tableview/table7_arraymodel.qml +++ b/tests/auto/controls/data/tableview/table7_arraymodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { model: ["A", "B", "C"] // qml diff --git a/tests/auto/controls/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml index c39ae533..9022d8ff 100644 --- a/tests/auto/controls/data/tableview/table8_itemmodel.qml +++ b/tests/auto/controls/data/tableview/table8_itemmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { model: Item { x: 10 }// qml diff --git a/tests/auto/controls/data/tableview/table_activated.qml b/tests/auto/controls/data/tableview/table_activated.qml index 227fbd88..3b458837 100644 --- a/tests/auto/controls/data/tableview/table_activated.qml +++ b/tests/auto/controls/data/tableview/table_activated.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { height: 120 diff --git a/tests/auto/controls/data/tableview/table_buttondelegate.qml b/tests/auto/controls/data/tableview/table_buttondelegate.qml index d5702524..f683aeac 100644 --- a/tests/auto/controls/data/tableview/table_buttondelegate.qml +++ b/tests/auto/controls/data/tableview/table_buttondelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { id: table diff --git a/tests/auto/controls/data/tableview/table_delegate2.qml b/tests/auto/controls/data/tableview/table_delegate2.qml index b55814ee..c9ad3d5e 100644 --- a/tests/auto/controls/data/tableview/table_delegate2.qml +++ b/tests/auto/controls/data/tableview/table_delegate2.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { id: table diff --git a/tests/auto/controls/data/tableview/table_delegate3.qml b/tests/auto/controls/data/tableview/table_delegate3.qml index 8ff37481..e8922dd9 100644 --- a/tests/auto/controls/data/tableview/table_delegate3.qml +++ b/tests/auto/controls/data/tableview/table_delegate3.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { id: table diff --git a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml index ce2cb93c..421a1ce9 100644 --- a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml +++ b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { id: tableView diff --git a/tests/auto/controls/data/tableview/table_mousearea.qml b/tests/auto/controls/data/tableview/table_mousearea.qml index 32f74e04..f63149ab 100644 --- a/tests/auto/controls/data/tableview/table_mousearea.qml +++ b/tests/auto/controls/data/tableview/table_mousearea.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { width:400 diff --git a/tests/auto/controls/data/tableview/table_multicolumns.qml b/tests/auto/controls/data/tableview/table_multicolumns.qml index bbfcab0a..58af9df6 100644 --- a/tests/auto/controls/data/tableview/table_multicolumns.qml +++ b/tests/auto/controls/data/tableview/table_multicolumns.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TableView { currentRow: 0 diff --git a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml index d2970466..6b9760d0 100644 --- a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 Row { width: 200 diff --git a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml index 451818f3..4f543fc1 100644 --- a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 Row { width: 100 diff --git a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml index ff973072..5b68153e 100644 --- a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml +++ b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 Row { width: 200 diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index 29e2a3f6..3836951c 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -55,18 +55,18 @@ TestCase { height:400 function test_isDefault() { - var tmp = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button1}', testCase, ''); + var tmp = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button1}', testCase, ''); compare(tmp.isDefault, false); tmp.destroy() } function test_text() { - var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_1}', testCase, ''); + var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button2_1}', testCase, ''); compare(tmp1.text, ""); tmp1.text = "Hello"; compare(tmp1.text, "Hello"); - var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_2; text: "Hello"}', testCase, ''); + var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button2_2; text: "Hello"}', testCase, ''); compare(tmp2.text, "Hello"); tmp1.destroy() tmp2.destroy() @@ -80,7 +80,7 @@ TestCase { function test_action() { var test_actionStr = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ property var testAction: Action { \ id: testAction; \ @@ -110,7 +110,7 @@ TestCase { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -127,7 +127,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index 40600d9e..2e3469d6 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -61,7 +61,7 @@ Item { } function init() { - checkBox = Qt.createQmlObject("import QtQuick.Controls 1.0; CheckBox { }", container, ""); + checkBox = Qt.createQmlObject("import QtQuick.Controls 1.1; CheckBox { }", container, ""); } function cleanup() { @@ -169,7 +169,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n" + var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n" + "Row { \n" + " property alias checkBox1: checkBox1 \n" + " property alias checkBox2: checkBox2 \n" @@ -243,7 +243,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 1079294c..aed53c5b 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -77,7 +77,7 @@ TestCase { } function test_keyupdown() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: 4 }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', testCase, ''); compare(comboBox.currentIndex, 0) @@ -93,7 +93,7 @@ TestCase { } function test_textrole() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); comboBox.textRole = "text" comboBox.model = model compare(comboBox.currentIndex, 0) @@ -110,7 +110,7 @@ TestCase { 'Coconut' ]; - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); comboBox.model = arrayModel compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "Banana") @@ -124,7 +124,7 @@ TestCase { {text: 'Coconut', color: 'Brown'} ]; - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); comboBox.textRole = "text" comboBox.model = arrayModel compare(comboBox.currentIndex, 0) @@ -137,7 +137,7 @@ TestCase { function test_arrayModelWithoutTextRole() { var arrayModel = ['Banana', 'Coconut', 'Apple'] - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); comboBox.model = arrayModel compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "Banana") @@ -149,7 +149,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ @@ -220,7 +220,7 @@ TestCase { if (Qt.platform.os === "osx") skip("When the menu pops up on OS X, it does not return and the test fails after time out") - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: 4 }', container, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, ''); comboBox.activeFocusOnPress = false verify(!comboBox.activeFocus) if (Qt.platform.os === "osx") // on mac when the menu open, the __popup function does not return @@ -243,7 +243,7 @@ TestCase { if (Qt.platform.os === "osx") skip("When the menu pops up on OS X, it does not return and the test fails after time out") - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: 4 }', container, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, ''); var menuIndex = getMenuIndex(comboBox) verify(menuIndex !== -1) comboBox.forceActiveFocus() @@ -262,7 +262,7 @@ TestCase { if (Qt.platform.os === "osx") skip("When the menu pops up on OS X, it does not return and the test fails after time out") - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: 4 }', container, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, ''); var menuIndex = getMenuIndex(comboBox) comboBox.currentIndex = 2 verify(menuIndex !== -1) @@ -284,7 +284,7 @@ TestCase { } function test_addRemoveItemsInModel_QTBUG_30379() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); comboBox.textRole = "text" comboBox.model = model var menuIndex = getMenuIndex(comboBox) @@ -301,7 +301,7 @@ TestCase { } function test_width_QTBUG_30377() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: ["A", "BB", "CCCCC"] }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: ["A", "BB", "CCCCC"] }', testCase, ''); compare(comboBox.currentIndex, 0) var initialWidth = comboBox.width comboBox.currentIndex = 1 @@ -312,7 +312,7 @@ TestCase { } function test_stringListModel() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { }', testCase, ''); comboBox.model = model_qstringlist; compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "A") @@ -326,7 +326,7 @@ TestCase { } function test_variantListModel() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { }', testCase, ''); comboBox.model = model_qvarlist; compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "3") diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index 97dbb9e5..d5986eb7 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -40,7 +40,7 @@ import QtQuick 2.1 import QtTest 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 Item { @@ -91,7 +91,7 @@ TestCase { function test_dynamicSize() { - var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '') + var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '') compare(groupbox.width, 16) compare(groupbox.height, 16) diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index 9b416d6a..c6d20049 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_createLabel() { - var label = Qt.createQmlObject('import QtQuick.Controls 1.0; Label {}', testCase, ''); + var label = Qt.createQmlObject('import QtQuick.Controls 1.1; Label {}', testCase, ''); label.destroy() } @@ -64,7 +64,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index 11e92969..d9158080 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -40,7 +40,7 @@ import QtQuick 2.1 import QtTest 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TestCase { id: testcase diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml index aa25917a..8f46108c 100644 --- a/tests/auto/controls/data/tst_menubar.qml +++ b/tests/auto/controls/data/tst_menubar.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createMenuBar() { - var menuBar = Qt.createQmlObject('import QtQuick.Controls 1.0; MenuBar {}', testCase, ''); + var menuBar = Qt.createQmlObject('import QtQuick.Controls 1.1; MenuBar {}', testCase, ''); menuBar.destroy() } } diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index 7febd661..b6b494fe 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_minimumvalue() { - var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, ''); progressBar.minimumValue = 5 progressBar.maximumValue = 10 @@ -69,7 +69,7 @@ TestCase { } function test_maximumvalue() { - var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, ''); progressBar.minimumValue = 5 progressBar.maximumValue = 10 @@ -83,7 +83,7 @@ TestCase { } function test_invalidMinMax() { - var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, ''); // minimumValue has priority over maximum if they are inconsistent @@ -100,7 +100,7 @@ TestCase { progressBar.value = 12 compare(progressBar.value, progressBar.minimumValue) - var progressBar2 = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, ''); + var progressBar2 = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, ''); compare(progressBar.value, progressBar.minimumValue) progressBar.destroy() progressBar2.destroy() @@ -108,20 +108,20 @@ TestCase { function test_initialization_order() { - var progressBar = Qt.createQmlObject("import QtQuick.Controls 1.0; ProgressBar {maximumValue: 100; value: 50}", + var progressBar = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar {maximumValue: 100; value: 50}", testCase, '') compare(progressBar.value, 50); - var progressBar2 = Qt.createQmlObject("import QtQuick.Controls 1.0; ProgressBar {" + + var progressBar2 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar {" + "value: 50; maximumValue: 100}", testCase, '') compare(progressBar2.value, 50); - var progressBar3 = Qt.createQmlObject("import QtQuick.Controls 1.0; ProgressBar { minimumValue: -50 ; value:-10}", + var progressBar3 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar { minimumValue: -50 ; value:-10}", testCase, '') compare(progressBar3.value, -10); - var progressBar4 = Qt.createQmlObject("import QtQuick.Controls 1.0; ProgressBar { value:-10; minimumValue: -50}", + var progressBar4 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar { value:-10; minimumValue: -50}", testCase, '') compare(progressBar4.value, -10); progressBar.destroy() @@ -135,7 +135,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index 7d04c0c3..c8f75912 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -61,7 +61,7 @@ Item { } function init() { - radioButton = Qt.createQmlObject('import QtQuick.Controls 1.0; RadioButton {}', container, ''); + radioButton = Qt.createQmlObject('import QtQuick.Controls 1.1; RadioButton {}', container, ''); } function cleanup() { @@ -139,7 +139,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n" + var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n" + "Row { \n" + " property alias radioButton1: radioButton1 \n" + " property alias radioButton2: radioButton2 \n" @@ -196,7 +196,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index 7c476122..c9503b88 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -40,7 +40,7 @@ import QtQuick 2.1 import QtTest 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 Item { @@ -93,8 +93,8 @@ TestCase { function test_clickToCenter() { var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ - import QtQuick.Controls.Styles 1.0; \ + import QtQuick.Controls 1.1; \ + import QtQuick.Controls.Styles 1.1; \ ScrollView { \ id: _control1; \ width: 100 ; height: 100; \ @@ -143,7 +143,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml index 80f34192..106f9520 100644 --- a/tests/auto/controls/data/tst_shortcuts.qml +++ b/tests/auto/controls/data/tst_shortcuts.qml @@ -40,7 +40,7 @@ import QtQuick 2.1 import QtTest 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 177a8fcb..57d79414 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -63,7 +63,7 @@ Item { } function test_vertical() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); verify(slider.height < slider.width) slider.orientation = Qt.Vertical; @@ -72,7 +72,7 @@ Item { } function test_minimumvalue() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 @@ -83,7 +83,7 @@ Item { } function test_maximumvalue() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 @@ -94,7 +94,7 @@ Item { } function test_rightLeftKeyPressed() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', container, ''); slider.forceActiveFocus() slider.maximumValue = 20 slider.minimumValue = 0 @@ -110,7 +110,7 @@ Item { } function test_mouseWheel() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', container, ''); slider.forceActiveFocus() slider.value = 0 slider.maximumValue = 300 @@ -153,7 +153,7 @@ Item { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -170,7 +170,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ @@ -240,8 +240,8 @@ Item { function test_updateValueWhileDragging() { var controlString = 'import QtQuick 2.1 ; \ - import QtQuick.Controls 1.0 ; \ - import QtQuick.Controls.Styles 1.0; \ + import QtQuick.Controls 1.1 ; \ + import QtQuick.Controls.Styles 1.1; \ Slider { \ width: 200 ; \ height : 50; \ @@ -270,7 +270,7 @@ Item { } function test_sliderOffset() { - var control = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') // Don't move slider value if mouse is inside handle regtion mouseClick(control, control.width/2, control.height/2) compare(control.value, 0.5) @@ -285,7 +285,7 @@ Item { function test_valueAndHandlePosition() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {minimumValue: 0; maximumValue: 100; width: 100; height: 20; stepSize: 1}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {minimumValue: 0; maximumValue: 100; width: 100; height: 20; stepSize: 1}', container, ''); slider.forceActiveFocus() slider.value = 0 compare(slider.__handlePos, 0) diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 267e9c4b..738be910 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -56,7 +56,7 @@ Item { property point downCoord: "0,0" function test_increment_key() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {maximumValue: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {maximumValue: 50}', container, '') spinbox.forceActiveFocus() compare(spinbox.maximumValue, 50) @@ -72,7 +72,7 @@ Item { } function test_decrement_key() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {minimumValue: 10}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {minimumValue: 10}', container, '') spinbox.forceActiveFocus() compare(spinbox.minimumValue, 10) @@ -118,7 +118,7 @@ Item { } function test_keyboard_input(data) { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.forceActiveFocus() if (data.decimals !== undefined) @@ -141,7 +141,7 @@ Item { } function test_increment_mouse() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {maximumValue: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {maximumValue: 50}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -157,7 +157,7 @@ Item { } function test_decrement_mouse() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {minimumValue: 10}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {minimumValue: 10}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -173,7 +173,7 @@ Item { } function test_move_mouse() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -198,7 +198,7 @@ Item { } function test_maxvalue() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.value = spinbox.maximumValue + 1 compare(spinbox.value, spinbox.maximumValue) @@ -215,7 +215,7 @@ Item { } function test_minvalue() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.value = spinbox.minimumValue - 1 compare(spinbox.value, spinbox.minimumValue) @@ -232,7 +232,7 @@ Item { } function test_decimals() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.decimals = 0 spinbox.value = 1.00001 @@ -259,7 +259,7 @@ Item { } function test_groupSeparators() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox { maximumValue: 1000 }', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox { maximumValue: 1000 }', container, '') spinbox.value = 1000 // QTBUG-31839: SpinBox displays group separators @@ -270,7 +270,7 @@ Item { function test_stepsize() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.stepSize = 2 @@ -289,7 +289,7 @@ Item { function test_negativeStepSize() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = -50 @@ -321,12 +321,12 @@ Item { function test_initialization_order() { - var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.0; SpinBox { id: spinbox;" + + var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.1; SpinBox { id: spinbox;" + "maximumValue: 2000; value: 1000; implicitWidth:80}", container, '') compare(spinbox.value, 1000); - var spinbox2 = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox { minimumValue: -1000 ; value:-1000}', + var spinbox2 = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox { minimumValue: -1000 ; value:-1000}', container, '') compare(spinbox2.value, -1000); spinbox.destroy() @@ -334,7 +334,7 @@ Item { } function test_activeFocusOnPress(){ - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {x: 20; y: 20; width: 100; height: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {x: 20; y: 20; width: 100; height: 50}', container, '') spinbox.activeFocusOnPress = false verify(!spinbox.activeFocus) mouseClick(spinbox, 30, 30) @@ -348,7 +348,7 @@ Item { function test_activeFocusOnTab() { var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ @@ -418,7 +418,7 @@ Item { function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = -50 spinbox.maximumValue = 50 @@ -453,7 +453,7 @@ Item { } function test_wheel() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = 0 spinbox.maximumValue = 99 diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml index 05101ff9..80cd9fb9 100644 --- a/tests/auto/controls/data/tst_splitview.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -40,7 +40,7 @@ import QtQuick 2.1 import QtTest 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_stack.qml b/tests/auto/controls/data/tst_stack.qml index a7363de7..c06eda3f 100644 --- a/tests/auto/controls/data/tst_stack.qml +++ b/tests/auto/controls/data/tst_stack.qml @@ -49,17 +49,17 @@ TestCase { height:400 function test_index() { - var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; Item { property int index: Stack.index }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.0; 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.0; Item { property int status: Stack.status }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.0; 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.0; Item { property StackView view: Stack.view }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.0; 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 3daac785..e70cf458 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -40,7 +40,7 @@ import QtQuick 2.1 import QtTest 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml index dfa19813..65bd83b1 100644 --- a/tests/auto/controls/data/tst_statusbar.qml +++ b/tests/auto/controls/data/tst_statusbar.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_createStatusBar() { - var statusBar = Qt.createQmlObject('import QtQuick.Controls 1.0; StatusBar {}', container, ''); + var statusBar = Qt.createQmlObject('import QtQuick.Controls 1.1; StatusBar {}', container, ''); statusBar.destroy() } @@ -64,7 +64,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_styles.qml b/tests/auto/controls/data/tst_styles.qml index f6b53b72..fc56e48c 100644 --- a/tests/auto/controls/data/tst_styles.qml +++ b/tests/auto/controls/data/tst_styles.qml @@ -55,105 +55,105 @@ Item { function test_createButtonStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ 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.0; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ 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.0; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.1; 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.0; import QtQuick.Controls.Styles 1.0; \ + 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ Rectangle { width: 50; height: 50; property Component style: TabViewStyle {}}' , container, '') } diff --git a/tests/auto/controls/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml index 939ede7e..cffe63b5 100644 --- a/tests/auto/controls/data/tst_tab.qml +++ b/tests/auto/controls/data/tst_tab.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createTab() { - var tab = Qt.createQmlObject('import QtQuick.Controls 1.0; Tab {}', testCase, ''); + var tab = Qt.createQmlObject('import QtQuick.Controls 1.1; Tab {}', testCase, ''); tab.destroy() } } diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 8e576113..d0c713ef 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -40,7 +40,7 @@ import QtQuick 2.1 import QtTest 1.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuickControlsTests 1.0 Item { @@ -72,7 +72,7 @@ TestCase { function test_basic_setup() { var test_instanceStr = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ TableView { \ TableViewColumn { \ } \ @@ -353,7 +353,7 @@ TestCase { } function test_columnWidth() { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var column = newColumn.createObject(testCase, {title: "title 1"}); verify(column.__view === null) @@ -362,7 +362,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.0; TableView { }', testCase, ''); + var tableView2 = Qt.createQmlObject('import QtQuick 2.1; 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 @@ -384,7 +384,7 @@ TestCase { } function test_addRemoveColumn() { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) tableView.addColumn(newColumn.createObject(testCase, {title: "title 1"})) compare(tableView.columnCount, 1) @@ -462,7 +462,7 @@ TestCase { } function test_moveColumn(data) { - var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var titles = ["title 1", "title 2", "title 3"] @@ -497,7 +497,7 @@ TestCase { function test_positionViewAtRow() { var test_instanceStr = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + 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 16eadf53..c471e40b 100644 --- a/tests/auto/controls/data/tst_tableviewcolumn.qml +++ b/tests/auto/controls/data/tst_tableviewcolumn.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createTableViewColumn() { - var tableViewColumn = Qt.createQmlObject('import QtQuick.Controls 1.0; TableViewColumn {}', testCase, ''); + var tableViewColumn = Qt.createQmlObject('import QtQuick.Controls 1.1; TableViewColumn {}', testCase, ''); tableViewColumn.destroy() } } diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml index 8093ebc3..980b1f16 100644 --- a/tests/auto/controls/data/tst_tabview.qml +++ b/tests/auto/controls/data/tst_tabview.qml @@ -54,12 +54,12 @@ TestCase { height:400 function test_createTabView() { - var tabView = Qt.createQmlObject('import QtQuick.Controls 1.0; TabView {}', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick.Controls 1.1; TabView {}', testCase, ''); tabView.destroy() } function test_repeater() { - var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { } } }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.1; 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.0; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.1; 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.0; TabView { }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.1; 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.0; TabView { }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { }', testCase, ''); compare(tabView.count, 0) var titles = ["title 1", "title 2", "title 3"] @@ -194,7 +194,7 @@ TestCase { function test_dynamicTabs() { var test_tabView = ' \ import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ TabView { \ id: tabView; \ Tab { title: "static" } \ @@ -225,7 +225,7 @@ TestCase { function test_mousePressOnTabBar() { var test_tabView = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Column { \ property alias tabview: _tabview; \ property alias textfield: _textfield; \ diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 7391daea..5d0778f1 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -54,7 +54,7 @@ TestCase { height: 400 function test_append() { - var textarea = Qt.createQmlObject('import QtQuick.Controls 1.0; TextArea {}', testCase, '') + var textarea = Qt.createQmlObject('import QtQuick.Controls 1.1; TextArea {}', testCase, '') compare(textarea.text, "") @@ -67,7 +67,7 @@ TestCase { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.0; TextArea {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.1; TextArea {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -82,7 +82,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; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 6c754f10..6a176997 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -53,7 +53,7 @@ TestCase { height: 400 function test_text() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') compare(textfield.text, "") textfield.text = "hello world" @@ -62,7 +62,7 @@ TestCase { } function test_maximumLength() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') textfield.text = "hello world" textfield.maximumLength = 5 @@ -71,7 +71,7 @@ TestCase { } function test_length() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') textfield.text = "hello world" compare(textfield.length, 11) @@ -80,7 +80,7 @@ TestCase { function test_readonly() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() compare(textfield.readOnly, false) @@ -92,7 +92,7 @@ TestCase { } function test_inputMask() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container , '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container , '') textfield.forceActiveFocus() // +/- not required, 1 digit required, 1 aphabetic character required and 2 digits not required @@ -131,7 +131,7 @@ TestCase { } function test_validator() { - var textfield = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') textfield.text = "blu" compare(textfield.acceptableInput, false) @@ -145,7 +145,7 @@ TestCase { } function test_selectAll() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -157,7 +157,7 @@ TestCase { } function test_select() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -172,7 +172,7 @@ TestCase { } function test_cursorPosition() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() compare(textfield.cursorPosition, 0) @@ -188,7 +188,7 @@ TestCase { } function test_selectWord() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -201,7 +201,7 @@ TestCase { } function test_copyPaste() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') textfield.text = "this is my text" textfield.select(0, 5) textfield.copy() @@ -212,7 +212,7 @@ TestCase { } function test_getText() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -222,7 +222,7 @@ TestCase { } function test_insert() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -232,7 +232,7 @@ TestCase { } function test_deselect() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -243,7 +243,7 @@ TestCase { } function test_undo() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -255,7 +255,7 @@ TestCase { } function test_redo() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -268,7 +268,7 @@ TestCase { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -283,7 +283,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; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index fe2c9bd2..60ca6313 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_createToolBar() { - var toolBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolBar {}', container, ''); + var toolBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolBar {}', container, ''); toolBar.destroy() } @@ -64,7 +64,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index 6af5677c..02ae5ede 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -55,12 +55,12 @@ TestCase { height:400 function test_createToolButton() { - var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolButton {}', testCase, ''); + var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolButton {}', testCase, ''); toolButton.destroy() } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolButton {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolButton {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -77,7 +77,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.1; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.1; \ Item { \ width: 200; \ height: 200; \ |