summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-03-14 11:44:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-14 15:21:38 +0100
commit5145aec470344b43669a6e1e68ccade3886d5351 (patch)
tree7485dc062acef6c5cabf0e313bbd7a584394e5fd /tests
parent6cd0d99182711108f9c61a94a7ae1b0d199b95be (diff)
downloadqtquickcontrols-5145aec470344b43669a6e1e68ccade3886d5351.tar.gz
Change imports from QtQuick 2.0 to QtQuick 2.1
Change-Id: If9df032c76e36f385aacd30cc31d6f02574c6f11 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/controls/data/rangemodel/rangemodel.qml2
-rw-r--r--tests/auto/controls/data/shortcut/shortcuts.qml2
-rw-r--r--tests/auto/controls/data/tableview/table1_qobjectmodel.qml2
-rw-r--r--tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml2
-rw-r--r--tests/auto/controls/data/tableview/table3_qobjectlist.qml2
-rw-r--r--tests/auto/controls/data/tableview/table4_qstringlist.qml2
-rw-r--r--tests/auto/controls/data/tableview/table5_listmodel.qml2
-rw-r--r--tests/auto/controls/data/tableview/table6_countmodel.qml2
-rw-r--r--tests/auto/controls/data/tableview/table7_arraymodel.qml2
-rw-r--r--tests/auto/controls/data/tableview/table8_itemmodel.qml2
-rw-r--r--tests/auto/controls/data/tst_applicationwindow.qml2
-rw-r--r--tests/auto/controls/data/tst_button.qml4
-rw-r--r--tests/auto/controls/data/tst_checkbox.qml4
-rw-r--r--tests/auto/controls/data/tst_combobox.qml4
-rw-r--r--tests/auto/controls/data/tst_label.qml2
-rw-r--r--tests/auto/controls/data/tst_menu.qml2
-rw-r--r--tests/auto/controls/data/tst_menubar.qml2
-rw-r--r--tests/auto/controls/data/tst_page.qml2
-rw-r--r--tests/auto/controls/data/tst_pagestack.qml2
-rw-r--r--tests/auto/controls/data/tst_progressbar.qml2
-rw-r--r--tests/auto/controls/data/tst_radiobutton.qml4
-rw-r--r--tests/auto/controls/data/tst_rangemodel.qml2
-rw-r--r--tests/auto/controls/data/tst_rowlayout.qml6
-rw-r--r--tests/auto/controls/data/tst_scrollview.qml2
-rw-r--r--tests/auto/controls/data/tst_shortcuts.qml2
-rw-r--r--tests/auto/controls/data/tst_slider.qml2
-rw-r--r--tests/auto/controls/data/tst_spinbox.qml2
-rw-r--r--tests/auto/controls/data/tst_splitview.qml2
-rw-r--r--tests/auto/controls/data/tst_statusbar.qml2
-rw-r--r--tests/auto/controls/data/tst_tab.qml2
-rw-r--r--tests/auto/controls/data/tst_tableview.qml2
-rw-r--r--tests/auto/controls/data/tst_tableviewcolumn.qml2
-rw-r--r--tests/auto/controls/data/tst_tabview.qml8
-rw-r--r--tests/auto/controls/data/tst_textarea.qml2
-rw-r--r--tests/auto/controls/data/tst_textfield.qml4
-rw-r--r--tests/auto/controls/data/tst_toolbar.qml2
-rw-r--r--tests/auto/controls/data/tst_toolbutton.qml2
-rw-r--r--tests/auto/qtdesktop/data/tst_groupbox.qml2
-rw-r--r--tests/manual/ContextMenu.qml2
-rw-r--r--tests/manual/Dialog.qml2
-rw-r--r--tests/manual/Layout.qml2
-rw-r--r--tests/manual/PageStack.qml4
-rw-r--r--tests/manual/WindowContextMenu.qml4
-rw-r--r--tests/manual/keynavigation.qml2
-rw-r--r--tests/manual/scrollview/main.qml2
-rw-r--r--tests/manual/splitter.qml2
-rw-r--r--tests/manual/stretching.qml2
-rw-r--r--tests/manual/stretchingcustom.qml2
-rw-r--r--tests/manual/tableviewmodels/qml/main.qml2
-rw-r--r--tests/manual/testbench/content/Components.qml2
-rw-r--r--tests/manual/testbench/content/PropertyLayouts.qml2
-rw-r--r--tests/manual/testbench/main.qml14
52 files changed, 70 insertions, 70 deletions
diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml
index d665fd9b..bf03dd0c 100644
--- a/tests/auto/controls/data/rangemodel/rangemodel.qml
+++ b/tests/auto/controls/data/rangemodel/rangemodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.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 dcccaa6f..c9c6f5f5 100644
--- a/tests/auto/controls/data/shortcut/shortcuts.qml
+++ b/tests/auto/controls/data/shortcut/shortcuts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
Rectangle {
diff --git a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml
index 36aa37b2..4b26f66d 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
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 d69d21ad..bc3da232 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
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 b39d084f..f3f64327 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
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 a36f52c2..75840499 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
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 b3348e45..c0e46abc 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
TableView {
diff --git a/tests/auto/controls/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml
index a5084944..995de485 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
TableView {
diff --git a/tests/auto/controls/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml
index 7e427a53..d3483ddc 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
TableView {
diff --git a/tests/auto/controls/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml
index bfbc5e9a..081f1d61 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.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
TableView {
diff --git a/tests/auto/controls/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml
index 0681f9f1..e465d47d 100644
--- a/tests/auto/controls/data/tst_applicationwindow.qml
+++ b/tests/auto/controls/data/tst_applicationwindow.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 7138deed..1efbd4e9 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
@@ -70,7 +70,7 @@ TestCase {
function test_action() {
var test_actionStr =
- 'import QtQuick 2.0; \
+ 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
property var testAction: Action { \
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index ee386523..ae996d01 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
Item {
@@ -165,7 +165,7 @@ Item {
}
function test_exclusiveGroup() {
- var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n"
+ "Row { \n"
+ " property alias checkBox1: checkBox1 \n"
+ " property alias checkBox2: checkBox2 \n"
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 9c7ab772..3a0f0568 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
@@ -50,7 +50,7 @@ TestCase {
property var model
function init() {
- model = Qt.createQmlObject("import QtQuick 2.0; ListModel {}", testCase, '')
+ model = Qt.createQmlObject("import QtQuick 2.1; ListModel {}", testCase, '')
model.append({ text: "Banana", color: "Yellow" })
model.append({ text: "Apple", color: "Green" })
model.append({ text: "Coconut", color: "Brown" })
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index e47f77c1..2f2591f8 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml
index 8d039e1d..7d621912 100644
--- a/tests/auto/controls/data/tst_menu.qml
+++ b/tests/auto/controls/data/tst_menu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml
index edf92b3b..80699d33 100644
--- a/tests/auto/controls/data/tst_menubar.qml
+++ b/tests/auto/controls/data/tst_menubar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml
index c43f809e..acb0f627 100644
--- a/tests/auto/controls/data/tst_page.qml
+++ b/tests/auto/controls/data/tst_page.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_pagestack.qml b/tests/auto/controls/data/tst_pagestack.qml
index bad1683b..e5c56dbd 100644
--- a/tests/auto/controls/data/tst_pagestack.qml
+++ b/tests/auto/controls/data/tst_pagestack.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index 4798d863..b68a592a 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index bf076ea5..c2e6bffd 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
Item {
@@ -135,7 +135,7 @@ Item {
}
function test_exclusiveGroup() {
- var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n"
+ "Row { \n"
+ " property alias radioButton1: radioButton1 \n"
+ " property alias radioButton2: radioButton2 \n"
diff --git a/tests/auto/controls/data/tst_rangemodel.qml b/tests/auto/controls/data/tst_rangemodel.qml
index dd3ac338..52697140 100644
--- a/tests/auto/controls/data/tst_rangemodel.qml
+++ b/tests/auto/controls/data/tst_rangemodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_rowlayout.qml b/tests/auto/controls/data/tst_rowlayout.qml
index 539c8e5b..e444dd95 100644
--- a/tests/auto/controls/data/tst_rowlayout.qml
+++ b/tests/auto/controls/data/tst_rowlayout.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
Item {
@@ -54,7 +54,7 @@ Item {
function test_fixedAndExpanding() {
var test_layoutStr =
- 'import QtQuick 2.0; \
+ 'import QtQuick 2.1; \
import QtQuick.Layouts 1.0; \
RowLayout { \
id: row; \
@@ -91,7 +91,7 @@ Item {
function test_allExpanding() {
var test_layoutStr =
- 'import QtQuick 2.0; \
+ 'import QtQuick 2.1; \
import QtQuick.Layouts 1.0; \
RowLayout { \
id: row; \
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 05519f6e..ee66939e 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml
index db1c46db..30c234a0 100644
--- a/tests/auto/controls/data/tst_shortcuts.qml
+++ b/tests/auto/controls/data/tst_shortcuts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
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 1cb65c67..305b0f57 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index b725b88a..5994b451 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
Item {
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index cf4eb6c2..fee25f3e 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml
index 1761a613..f85195bd 100644
--- a/tests/auto/controls/data/tst_statusbar.qml
+++ b/tests/auto/controls/data/tst_statusbar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml
index 9c495153..d839ff41 100644
--- a/tests/auto/controls/data/tst_tab.qml
+++ b/tests/auto/controls/data/tst_tab.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml
index f5c220c2..475d2dd9 100644
--- a/tests/auto/controls/data/tst_tableview.qml
+++ b/tests/auto/controls/data/tst_tableview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
import QtQuickControlsTests 1.0
diff --git a/tests/auto/controls/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml
index 5bea2bb9..37468af4 100644
--- a/tests/auto/controls/data/tst_tableviewcolumn.qml
+++ b/tests/auto/controls/data/tst_tableviewcolumn.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml
index 0c9d0057..7bf9a00f 100644
--- a/tests/auto/controls/data/tst_tabview.qml
+++ b/tests/auto/controls/data/tst_tabview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
@@ -53,7 +53,7 @@ TestCase {
}
function test_repeater() {
- var tabView = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { } } }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { } } }', testCase, '');
compare(tabView.count, 3)
}
@@ -63,7 +63,7 @@ TestCase {
}
function test_changeIndex() {
- var tabView = Qt.createQmlObject('import QtQuick 2.0; 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.0; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, '');
compare(tabView.count, 3)
verify(tabView.tabAt(1).item == undefined)
tabView.currentIndex = 1
@@ -75,7 +75,7 @@ TestCase {
function test_addRemoveTab() {
- var tabView = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TabView { }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { }', testCase, '');
compare(tabView.count, 0)
tabView.addTab("title 1", newTab)
compare(tabView.count, 1)
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index a74d8a63..27f68a1a 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index d4f39f3a..e9bd4541 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
@@ -122,7 +122,7 @@ TestCase {
}
function test_validator() {
- var textfield = Qt.createQmlObject('import QtQuick 2.0; 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.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
textfield.text = "blu"
compare(textfield.acceptableInput, false)
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index 83e3927a..68765b0d 100644
--- a/tests/auto/controls/data/tst_toolbar.qml
+++ b/tests/auto/controls/data/tst_toolbar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 14613e9d..e488d03b 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
TestCase {
diff --git a/tests/auto/qtdesktop/data/tst_groupbox.qml b/tests/auto/qtdesktop/data/tst_groupbox.qml
index 8b4de71b..f5ddf4c9 100644
--- a/tests/auto/qtdesktop/data/tst_groupbox.qml
+++ b/tests/auto/qtdesktop/data/tst_groupbox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtTest 1.0
import QtDesktop 1.0
diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml
index dfbab938..6310ef7d 100644
--- a/tests/manual/ContextMenu.qml
+++ b/tests/manual/ContextMenu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
diff --git a/tests/manual/Dialog.qml b/tests/manual/Dialog.qml
index 47f4d7b4..00f9aeed 100644
--- a/tests/manual/Dialog.qml
+++ b/tests/manual/Dialog.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
Rectangle {
diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml
index d23aaa21..19374f62 100644
--- a/tests/manual/Layout.qml
+++ b/tests/manual/Layout.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
diff --git a/tests/manual/PageStack.qml b/tests/manual/PageStack.qml
index 5c5491d6..0b3713af 100644
--- a/tests/manual/PageStack.qml
+++ b/tests/manual/PageStack.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick 2.1
+import QtQuick.Window 2.1
import QtQuick.Controls 1.0
Window {
diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml
index 573c9c4f..9989ae03 100644
--- a/tests/manual/WindowContextMenu.qml
+++ b/tests/manual/WindowContextMenu.qml
@@ -38,9 +38,9 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
-import QtQuick.Window 2.0
+import QtQuick.Window 2.1
Window {
width: 540
diff --git a/tests/manual/keynavigation.qml b/tests/manual/keynavigation.qml
index 515c6e01..55ddb478 100644
--- a/tests/manual/keynavigation.qml
+++ b/tests/manual/keynavigation.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 0.1
ApplicationWindow {
diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml
index 8c077af8..cb26763f 100644
--- a/tests/manual/scrollview/main.qml
+++ b/tests/manual/scrollview/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml
index 104c92e6..e4b08e70 100644
--- a/tests/manual/splitter.qml
+++ b/tests/manual/splitter.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
ApplicationWindow {
diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml
index 9af4ca1d..a8d86eb3 100644
--- a/tests/manual/stretching.qml
+++ b/tests/manual/stretching.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml
index 8df1f794..fa56757f 100644
--- a/tests/manual/stretchingcustom.qml
+++ b/tests/manual/stretchingcustom.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml
index e99165f3..f9da0f68 100644
--- a/tests/manual/tableviewmodels/qml/main.qml
+++ b/tests/manual/tableviewmodels/qml/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
Rectangle {
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index 8a3195b3..8eca5e75 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
Item {
diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml
index 88d64acf..3a870e85 100644
--- a/tests/manual/testbench/content/PropertyLayouts.qml
+++ b/tests/manual/testbench/content/PropertyLayouts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index a5f5f693..ae0a07c6 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import "content"
@@ -230,7 +230,7 @@ ApplicationWindow {
case "HorizontalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft});
enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight});
@@ -239,7 +239,7 @@ ApplicationWindow {
case "VerticalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop});
enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom});
@@ -248,7 +248,7 @@ ApplicationWindow {
case "InputMethodHints":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone});
enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText});
@@ -271,7 +271,7 @@ ApplicationWindow {
case "Orientation":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal});
enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical});
@@ -279,7 +279,7 @@ ApplicationWindow {
case "EchoMode":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal});
enumModelData.append({ text: "TextInput.Password", value: TextInput.Password});
@@ -291,7 +291,7 @@ ApplicationWindow {
case "TextColor":
isColor = true
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Amber", value: "#FF7E00"});
enumModelData.append({ text: "Azure", value: "#007FFF"});