From 5145aec470344b43669a6e1e68ccade3886d5351 Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Thu, 14 Mar 2013 11:44:48 +0100
Subject: [PATCH] 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>
---
examples/gallery/content/ChildWindow.qml | 4 ++--
examples/gallery/content/Controls.qml | 2 +-
examples/gallery/content/ModelView.qml | 4 ++--
examples/gallery/content/Panel.qml | 2 +-
examples/gallery/content/Styles.qml | 2 +-
examples/gallery/main.qml | 2 +-
examples/splitters/main.qml | 2 +-
examples/tableview/main.qml | 2 +-
examples/touch/content/AndroidDelegate.qml | 2 +-
examples/touch/content/ButtonPage.qml | 2 +-
examples/touch/content/ProgressBarPage.qml | 2 +-
examples/touch/content/SliderPage.qml | 2 +-
examples/touch/content/TabBarPage.qml | 2 +-
examples/touch/content/TextInputPage.qml | 2 +-
examples/touch/main.qml | 2 +-
src/controls/ApplicationWindow.qml | 2 +-
src/controls/Button.qml | 2 +-
src/controls/CheckBox.qml | 2 +-
src/controls/ComboBox.qml | 2 +-
src/controls/GroupBox.qml | 2 +-
src/controls/Label.qml | 2 +-
src/controls/Menu.qml | 2 +-
src/controls/MenuBar.qml | 2 +-
src/controls/Page.qml | 2 +-
src/controls/PageAnimation.qml | 2 +-
src/controls/PageStack.qml | 2 +-
src/controls/PageTransition.qml | 2 +-
src/controls/ProgressBar.qml | 2 +-
src/controls/RadioButton.qml | 2 +-
src/controls/ScrollView.qml | 2 +-
src/controls/Slider.qml | 2 +-
src/controls/SpinBox.qml | 2 +-
src/controls/SplitView.qml | 2 +-
src/controls/StatusBar.qml | 2 +-
src/controls/Tab.qml | 2 +-
src/controls/TabView.qml | 2 +-
src/controls/TableView.qml | 2 +-
src/controls/TableViewColumn.qml | 2 +-
src/controls/TextArea.qml | 2 +-
src/controls/TextField.qml | 4 ++--
src/controls/ToolBar.qml | 2 +-
src/controls/ToolButton.qml | 2 +-
src/experimental/Dial.qml | 2 +-
src/experimental/Dialog.qml | 4 ++--
src/private/AbstractCheckable.qml | 2 +-
src/private/BasicButton.qml | 2 +-
src/private/Control.qml | 2 +-
src/private/FocusFrame.qml | 2 +-
src/private/ModalPopupBehavior.qml | 2 +-
src/private/PageSlideTransition.qml | 2 +-
src/private/ScrollBar.qml | 2 +-
src/private/ScrollViewHelper.qml | 2 +-
src/private/TabBar.qml | 2 +-
src/styles/ButtonStyle.qml | 2 +-
src/styles/CheckBoxStyle.qml | 2 +-
src/styles/ComboBoxStyle.qml | 2 +-
src/styles/Desktop/ButtonStyle.qml | 2 +-
src/styles/Desktop/CheckBoxStyle.qml | 2 +-
src/styles/Desktop/ComboBoxStyle.qml | 2 +-
src/styles/Desktop/GroupBoxStyle.qml | 2 +-
src/styles/Desktop/MenuBarStyle.qml | 2 +-
src/styles/Desktop/MenuStyle.qml | 2 +-
src/styles/Desktop/ProgressBarStyle.qml | 2 +-
src/styles/Desktop/RadioButtonStyle.qml | 2 +-
src/styles/Desktop/ScrollBarStyle.qml | 2 +-
src/styles/Desktop/SliderStyle.qml | 2 +-
src/styles/Desktop/SpinBoxStyle.qml | 2 +-
src/styles/Desktop/TabViewStyle.qml | 2 +-
src/styles/Desktop/TextFieldStyle.qml | 2 +-
src/styles/Desktop/ToolBarStyle.qml | 2 +-
src/styles/Desktop/ToolButtonStyle.qml | 2 +-
src/styles/GroupBoxStyle.qml | 2 +-
src/styles/MenuBarStyle.qml | 2 +-
src/styles/MenuStyle.qml | 2 +-
src/styles/ProgressBarStyle.qml | 2 +-
src/styles/RadioButtonStyle.qml | 2 +-
src/styles/ScrollBarStyle.qml | 2 +-
src/styles/SliderStyle.qml | 2 +-
src/styles/SpinBoxStyle.qml | 2 +-
src/styles/Style.qml | 2 +-
src/styles/TabViewStyle.qml | 2 +-
src/styles/TextFieldStyle.qml | 2 +-
src/styles/ToolBarStyle.qml | 2 +-
src/styles/ToolButtonStyle.qml | 2 +-
tests/auto/controls/data/rangemodel/rangemodel.qml | 2 +-
tests/auto/controls/data/shortcut/shortcuts.qml | 2 +-
.../data/tableview/table1_qobjectmodel.qml | 2 +-
.../data/tableview/table2_qabstractitemmodel.qml | 2 +-
.../controls/data/tableview/table3_qobjectlist.qml | 2 +-
.../controls/data/tableview/table4_qstringlist.qml | 2 +-
.../controls/data/tableview/table5_listmodel.qml | 2 +-
.../controls/data/tableview/table6_countmodel.qml | 2 +-
.../controls/data/tableview/table7_arraymodel.qml | 2 +-
.../controls/data/tableview/table8_itemmodel.qml | 2 +-
tests/auto/controls/data/tst_applicationwindow.qml | 2 +-
tests/auto/controls/data/tst_button.qml | 4 ++--
tests/auto/controls/data/tst_checkbox.qml | 4 ++--
tests/auto/controls/data/tst_combobox.qml | 4 ++--
tests/auto/controls/data/tst_label.qml | 2 +-
tests/auto/controls/data/tst_menu.qml | 2 +-
tests/auto/controls/data/tst_menubar.qml | 2 +-
tests/auto/controls/data/tst_page.qml | 2 +-
tests/auto/controls/data/tst_pagestack.qml | 2 +-
tests/auto/controls/data/tst_progressbar.qml | 2 +-
tests/auto/controls/data/tst_radiobutton.qml | 4 ++--
tests/auto/controls/data/tst_rangemodel.qml | 2 +-
tests/auto/controls/data/tst_rowlayout.qml | 6 +++---
tests/auto/controls/data/tst_scrollview.qml | 2 +-
tests/auto/controls/data/tst_shortcuts.qml | 2 +-
tests/auto/controls/data/tst_slider.qml | 2 +-
tests/auto/controls/data/tst_spinbox.qml | 2 +-
tests/auto/controls/data/tst_splitview.qml | 2 +-
tests/auto/controls/data/tst_statusbar.qml | 2 +-
tests/auto/controls/data/tst_tab.qml | 2 +-
tests/auto/controls/data/tst_tableview.qml | 2 +-
tests/auto/controls/data/tst_tableviewcolumn.qml | 2 +-
tests/auto/controls/data/tst_tabview.qml | 8 ++++----
tests/auto/controls/data/tst_textarea.qml | 2 +-
tests/auto/controls/data/tst_textfield.qml | 4 ++--
tests/auto/controls/data/tst_toolbar.qml | 2 +-
tests/auto/controls/data/tst_toolbutton.qml | 2 +-
tests/auto/qtdesktop/data/tst_groupbox.qml | 2 +-
tests/manual/ContextMenu.qml | 2 +-
tests/manual/Dialog.qml | 2 +-
tests/manual/Layout.qml | 2 +-
tests/manual/PageStack.qml | 4 ++--
tests/manual/WindowContextMenu.qml | 4 ++--
tests/manual/keynavigation.qml | 2 +-
tests/manual/scrollview/main.qml | 2 +-
tests/manual/splitter.qml | 2 +-
tests/manual/stretching.qml | 2 +-
tests/manual/stretchingcustom.qml | 2 +-
tests/manual/tableviewmodels/qml/main.qml | 2 +-
tests/manual/testbench/content/Components.qml | 2 +-
tests/manual/testbench/content/PropertyLayouts.qml | 2 +-
tests/manual/testbench/main.qml | 14 +++++++-------
136 files changed, 158 insertions(+), 158 deletions(-)
diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml
index 74b059564..c4094209f 100644
--- a/examples/gallery/content/ChildWindow.qml
+++ b/examples/gallery/content/ChildWindow.qml
@@ -42,8 +42,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/examples/gallery/content/Controls.qml b/examples/gallery/content/Controls.qml
index 0a2c74ab2..ff4c370a9 100644
--- a/examples/gallery/content/Controls.qml
+++ b/examples/gallery/content/Controls.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/examples/gallery/content/ModelView.qml b/examples/gallery/content/ModelView.qml
index cd731ca9f..81bd9f7b9 100644
--- a/examples/gallery/content/ModelView.qml
+++ b/examples/gallery/content/ModelView.qml
@@ -42,9 +42,9 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
-//import QtQuick.XmlListModel 2.0
+//import QtQuick.XmlListModel 2.1
Item {
id: root
diff --git a/examples/gallery/content/Panel.qml b/examples/gallery/content/Panel.qml
index 60905fd7f..9cfc7250f 100644
--- a/examples/gallery/content/Panel.qml
+++ b/examples/gallery/content/Panel.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
Rectangle {
diff --git a/examples/gallery/content/Styles.qml b/examples/gallery/content/Styles.qml
index 2950ef179..8aeb03451 100644
--- a/examples/gallery/content/Styles.qml
+++ b/examples/gallery/content/Styles.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/examples/gallery/main.qml b/examples/gallery/main.qml
index 1db942230..911cbe1d8 100644
--- a/examples/gallery/main.qml
+++ b/examples/gallery/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Controls.Private 1.0
diff --git a/examples/splitters/main.qml b/examples/splitters/main.qml
index 0d35ae71f..1df39a823 100644
--- a/examples/splitters/main.qml
+++ b/examples/splitters/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
diff --git a/examples/tableview/main.qml b/examples/tableview/main.qml
index 8624120cb..e1d38d405 100644
--- a/examples/tableview/main.qml
+++ b/examples/tableview/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import QtQuick.XmlListModel 2.0
diff --git a/examples/touch/content/AndroidDelegate.qml b/examples/touch/content/AndroidDelegate.qml
index c51fe07a4..36a439a8e 100644
--- a/examples/touch/content/AndroidDelegate.qml
+++ b/examples/touch/content/AndroidDelegate.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
Item {
id: root
diff --git a/examples/touch/content/ButtonPage.qml b/examples/touch/content/ButtonPage.qml
index dbe77836c..ff86c8140 100644
--- a/examples/touch/content/ButtonPage.qml
+++ b/examples/touch/content/ButtonPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/examples/touch/content/ProgressBarPage.qml b/examples/touch/content/ProgressBarPage.qml
index d5b1a5904..abbf78fc7 100644
--- a/examples/touch/content/ProgressBarPage.qml
+++ b/examples/touch/content/ProgressBarPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/examples/touch/content/SliderPage.qml b/examples/touch/content/SliderPage.qml
index 2651837f4..d90a3c2cd 100644
--- a/examples/touch/content/SliderPage.qml
+++ b/examples/touch/content/SliderPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/examples/touch/content/TabBarPage.qml b/examples/touch/content/TabBarPage.qml
index 4edbaabde..0a47308b6 100644
--- a/examples/touch/content/TabBarPage.qml
+++ b/examples/touch/content/TabBarPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/examples/touch/content/TextInputPage.qml b/examples/touch/content/TextInputPage.qml
index fd84d05e4..e363648b8 100644
--- a/examples/touch/content/TextInputPage.qml
+++ b/examples/touch/content/TextInputPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/examples/touch/main.qml b/examples/touch/main.qml
index 05ad18f82..3ce116f36 100644
--- a/examples/touch/main.qml
+++ b/examples/touch/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import "content"
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index 03eb8acbc..48d5ffeb0 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
-import QtQuick 2.0
import QtQuick.Window 2.1
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Button.qml b/src/controls/Button.qml
index 57b5b3557..5317e6147 100644
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml
index 542d0f3ed..c459e812b 100644
--- a/src/controls/CheckBox.qml
+++ b/src/controls/CheckBox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index e76e1f5af..14dca758a 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml
index e7cf4864e..0571d1fb7 100644
--- a/src/controls/GroupBox.qml
+++ b/src/controls/GroupBox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/Label.qml b/src/controls/Label.qml
index 460e77cec..e983ecc79 100644
--- a/src/controls/Label.qml
+++ b/src/controls/Label.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
/*!
\qmltype Label
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml
index 8641a0e14..ddbef1ae9 100644
--- a/src/controls/Menu.qml
+++ b/src/controls/Menu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index 9abe5cead..e03ae4870 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Page.qml b/src/controls/Page.qml
index 7ab9194cf..4295f65c0 100644
--- a/src/controls/Page.qml
+++ b/src/controls/Page.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/controls/PageAnimation.qml b/src/controls/PageAnimation.qml
index 0481e5f88..2e9c3f0f7 100644
--- a/src/controls/PageAnimation.qml
+++ b/src/controls/PageAnimation.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
ParallelAnimation {
id: root
diff --git a/src/controls/PageStack.qml b/src/controls/PageStack.qml
index c40f22ea5..89cf0170c 100644
--- a/src/controls/PageStack.qml
+++ b/src/controls/PageStack.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Private/PageStack.js" as JSArray
diff --git a/src/controls/PageTransition.qml b/src/controls/PageTransition.qml
index 6f827f907..bb212b0c7 100644
--- a/src/controls/PageTransition.qml
+++ b/src/controls/PageTransition.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
/*!
\qmltype PageTransition
diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml
index 1f4e6bf3a..e49ae8be8 100644
--- a/src/controls/ProgressBar.qml
+++ b/src/controls/ProgressBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml
index 47eab5ee3..bfb37a606 100644
--- a/src/controls/RadioButton.qml
+++ b/src/controls/RadioButton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 38d580d29..8cf5b48ae 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index 28f32765a..7f7231acf 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index c82e3410f..576a13c10 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml
index 82d196faa..ba082f8bd 100644
--- a/src/controls/SplitView.qml
+++ b/src/controls/SplitView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Controls.Private 1.0 as Private
diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml
index 4c3e214cb..cba976c8b 100644
--- a/src/controls/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Tab.qml b/src/controls/Tab.qml
index 91fa7ba90..b7d4fb7f5 100644
--- a/src/controls/Tab.qml
+++ b/src/controls/Tab.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
/*!
\qmltype Tab
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index d8e848890..c8e4b7a64 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 696b41dc0..ca5ecb592 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml
index cf9e35ee8..fe83561ee 100644
--- a/src/controls/TableViewColumn.qml
+++ b/src/controls/TableViewColumn.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
/*!
\qmltype TableViewColumn
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index 49e31bdbc..85c0e056a 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
/*!
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index f88320d1c..8a9173a93 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles"
@@ -377,7 +377,7 @@ Control {
integers between 11 and 31 into the text input:
\code
- import QtQuick 2.0
+ import QtQuick 2.1
import QtQuick.Controls 1.0
TextField {
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index 8dea85e5d..e9e993f96 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index 613f925e6..833ba1273 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "Styles/Settings.js" as Settings
diff --git a/src/experimental/Dial.qml b/src/experimental/Dial.qml
index 2cbc15e1b..fb649bf9a 100644
--- a/src/experimental/Dial.qml
+++ b/src/experimental/Dial.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/experimental/Dialog.qml b/src/experimental/Dialog.qml
index dd71c2fc5..9f9139217 100644
--- a/src/experimental/Dialog.qml
+++ b/src/experimental/Dialog.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
/*!
diff --git a/src/private/AbstractCheckable.qml b/src/private/AbstractCheckable.qml
index 08c410da7..f0acf48fb 100644
--- a/src/private/AbstractCheckable.qml
+++ b/src/private/AbstractCheckable.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/private/BasicButton.qml b/src/private/BasicButton.qml
index e1336b14c..412028a08 100644
--- a/src/private/BasicButton.qml
+++ b/src/private/BasicButton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/src/private/Control.qml b/src/private/Control.qml
index ab0fe93a1..e18e83f30 100644
--- a/src/private/Control.qml
+++ b/src/private/Control.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
/*!
diff --git a/src/private/FocusFrame.qml b/src/private/FocusFrame.qml
index 34f27df3d..08f4b04a7 100644
--- a/src/private/FocusFrame.qml
+++ b/src/private/FocusFrame.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Private 1.0
/*!
diff --git a/src/private/ModalPopupBehavior.qml b/src/private/ModalPopupBehavior.qml
index 6fd4b5f29..1c6db2ff1 100644
--- a/src/private/ModalPopupBehavior.qml
+++ b/src/private/ModalPopupBehavior.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
// KNOWN ISSUES
// none
diff --git a/src/private/PageSlideTransition.qml b/src/private/PageSlideTransition.qml
index 2e4b53a77..d77e1eaf8 100644
--- a/src/private/PageSlideTransition.qml
+++ b/src/private/PageSlideTransition.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/private/ScrollBar.qml b/src/private/ScrollBar.qml
index 3d4a5d1f9..4aaa2f766 100644
--- a/src/private/ScrollBar.qml
+++ b/src/private/ScrollBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import "../Styles/Settings.js" as Settings
diff --git a/src/private/ScrollViewHelper.qml b/src/private/ScrollViewHelper.qml
index 1759edda7..ec0194c2d 100644
--- a/src/private/ScrollViewHelper.qml
+++ b/src/private/ScrollViewHelper.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/private/TabBar.qml b/src/private/TabBar.qml
index d0ae37955..a96ee1005 100644
--- a/src/private/TabBar.qml
+++ b/src/private/TabBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/ButtonStyle.qml b/src/styles/ButtonStyle.qml
index 2fb265c07..6cd165e6b 100644
--- a/src/styles/ButtonStyle.qml
+++ b/src/styles/ButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/CheckBoxStyle.qml b/src/styles/CheckBoxStyle.qml
index 011c8cdb3..77b6c60dc 100644
--- a/src/styles/CheckBoxStyle.qml
+++ b/src/styles/CheckBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/ComboBoxStyle.qml b/src/styles/ComboBoxStyle.qml
index e9ca29ffb..7a2da9607 100644
--- a/src/styles/ComboBoxStyle.qml
+++ b/src/styles/ComboBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
/*!
diff --git a/src/styles/Desktop/ButtonStyle.qml b/src/styles/Desktop/ButtonStyle.qml
index 68022ae97..fb1e52043 100644
--- a/src/styles/Desktop/ButtonStyle.qml
+++ b/src/styles/Desktop/ButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/CheckBoxStyle.qml b/src/styles/Desktop/CheckBoxStyle.qml
index a644e533d..0388fffaf 100644
--- a/src/styles/Desktop/CheckBoxStyle.qml
+++ b/src/styles/Desktop/CheckBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/ComboBoxStyle.qml b/src/styles/Desktop/ComboBoxStyle.qml
index 368f7e875..fba1998c5 100644
--- a/src/styles/Desktop/ComboBoxStyle.qml
+++ b/src/styles/Desktop/ComboBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/GroupBoxStyle.qml b/src/styles/Desktop/GroupBoxStyle.qml
index 281daf984..ab49f8a32 100644
--- a/src/styles/Desktop/GroupBoxStyle.qml
+++ b/src/styles/Desktop/GroupBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/MenuBarStyle.qml b/src/styles/Desktop/MenuBarStyle.qml
index 5abd17112..d0a6e16df 100644
--- a/src/styles/Desktop/MenuBarStyle.qml
+++ b/src/styles/Desktop/MenuBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/MenuStyle.qml b/src/styles/Desktop/MenuStyle.qml
index da93d12c2..6de5c95a5 100644
--- a/src/styles/Desktop/MenuStyle.qml
+++ b/src/styles/Desktop/MenuStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/ProgressBarStyle.qml b/src/styles/Desktop/ProgressBarStyle.qml
index b302755ed..7d7cbc544 100644
--- a/src/styles/Desktop/ProgressBarStyle.qml
+++ b/src/styles/Desktop/ProgressBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/RadioButtonStyle.qml b/src/styles/Desktop/RadioButtonStyle.qml
index ff9f2b582..272e2e878 100644
--- a/src/styles/Desktop/RadioButtonStyle.qml
+++ b/src/styles/Desktop/RadioButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/ScrollBarStyle.qml b/src/styles/Desktop/ScrollBarStyle.qml
index bd4fff4c2..dc175f9aa 100644
--- a/src/styles/Desktop/ScrollBarStyle.qml
+++ b/src/styles/Desktop/ScrollBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/SliderStyle.qml b/src/styles/Desktop/SliderStyle.qml
index 108dcef63..823e77464 100644
--- a/src/styles/Desktop/SliderStyle.qml
+++ b/src/styles/Desktop/SliderStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/SpinBoxStyle.qml b/src/styles/Desktop/SpinBoxStyle.qml
index 5b560a49a..3405213b5 100644
--- a/src/styles/Desktop/SpinBoxStyle.qml
+++ b/src/styles/Desktop/SpinBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/TabViewStyle.qml b/src/styles/Desktop/TabViewStyle.qml
index 20ef36d12..1ec473d81 100644
--- a/src/styles/Desktop/TabViewStyle.qml
+++ b/src/styles/Desktop/TabViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.0
diff --git a/src/styles/Desktop/TextFieldStyle.qml b/src/styles/Desktop/TextFieldStyle.qml
index def6d06ea..5024ca861 100644
--- a/src/styles/Desktop/TextFieldStyle.qml
+++ b/src/styles/Desktop/TextFieldStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/ToolBarStyle.qml b/src/styles/Desktop/ToolBarStyle.qml
index 9e44df425..52a4d09e8 100644
--- a/src/styles/Desktop/ToolBarStyle.qml
+++ b/src/styles/Desktop/ToolBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/Desktop/ToolButtonStyle.qml b/src/styles/Desktop/ToolButtonStyle.qml
index 3dbabc17d..af3da43c0 100644
--- a/src/styles/Desktop/ToolButtonStyle.qml
+++ b/src/styles/Desktop/ToolButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/GroupBoxStyle.qml b/src/styles/GroupBoxStyle.qml
index 27a7995af..2edd05041 100644
--- a/src/styles/GroupBoxStyle.qml
+++ b/src/styles/GroupBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/MenuBarStyle.qml b/src/styles/MenuBarStyle.qml
index 3d31db99b..6b7950ebf 100644
--- a/src/styles/MenuBarStyle.qml
+++ b/src/styles/MenuBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
/*!
diff --git a/src/styles/MenuStyle.qml b/src/styles/MenuStyle.qml
index df48964bf..d80ba9e6e 100644
--- a/src/styles/MenuStyle.qml
+++ b/src/styles/MenuStyle.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/src/styles/ProgressBarStyle.qml b/src/styles/ProgressBarStyle.qml
index 75fc9f520..799cb6764 100644
--- a/src/styles/ProgressBarStyle.qml
+++ b/src/styles/ProgressBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/RadioButtonStyle.qml b/src/styles/RadioButtonStyle.qml
index a5157efe7..764e306f8 100644
--- a/src/styles/RadioButtonStyle.qml
+++ b/src/styles/RadioButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/ScrollBarStyle.qml b/src/styles/ScrollBarStyle.qml
index 65ff068b5..4fed597d2 100644
--- a/src/styles/ScrollBarStyle.qml
+++ b/src/styles/ScrollBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/SliderStyle.qml b/src/styles/SliderStyle.qml
index 7fb03742f..2f618a179 100644
--- a/src/styles/SliderStyle.qml
+++ b/src/styles/SliderStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/styles/SpinBoxStyle.qml b/src/styles/SpinBoxStyle.qml
index 4d627b289..890e73445 100644
--- a/src/styles/SpinBoxStyle.qml
+++ b/src/styles/SpinBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/Style.qml b/src/styles/Style.qml
index 977f61986..6cb653803 100644
--- a/src/styles/Style.qml
+++ b/src/styles/Style.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
/*!
diff --git a/src/styles/TabViewStyle.qml b/src/styles/TabViewStyle.qml
index bcc8d4faa..9f4c0bd99 100644
--- a/src/styles/TabViewStyle.qml
+++ b/src/styles/TabViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls.Styles 1.0
/*!
diff --git a/src/styles/TextFieldStyle.qml b/src/styles/TextFieldStyle.qml
index 644b853bc..c2467ee8f 100644
--- a/src/styles/TextFieldStyle.qml
+++ b/src/styles/TextFieldStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/ToolBarStyle.qml b/src/styles/ToolBarStyle.qml
index ec1612c59..450304ed0 100644
--- a/src/styles/ToolBarStyle.qml
+++ b/src/styles/ToolBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/src/styles/ToolButtonStyle.qml b/src/styles/ToolButtonStyle.qml
index 2d63e116c..13b9813c7 100644
--- a/src/styles/ToolButtonStyle.qml
+++ b/src/styles/ToolButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.1
import QtQuick.Controls 1.0
/*!
diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml
index d665fd9b3..bf03dd0c6 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 dcccaa6fb..c9c6f5f57 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 36aa37b2e..4b26f66dd 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 d69d21ad8..bc3da2328 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 b39d084fd..f3f64327e 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 a36f52c29..75840499a 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 b3348e457..c0e46abcb 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 a5084944d..995de4852 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 7e427a534..d3483ddcb 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 bfbc5e9a6..081f1d61b 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 0681f9f17..e465d47d0 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 7138deed1..1efbd4e9d 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 ee3865238..ae996d01e 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 9c7ab7722..3a0f05688 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 e47f77c1a..2f2591f85 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 8d039e1dc..7d6219123 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 edf92b3bf..80699d336 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 c43f809eb..acb0f627b 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 bad1683b1..e5c56dbdb 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 4798d863a..b68a592a6 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 bf076ea55..c2e6bffd2 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 dd3ac3380..526971400 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 539c8e5ba..e444dd950 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 05519f6ed..ee66939e8 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 db1c46dbb..30c234a0b 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 1cb65c672..305b0f57f 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 b725b88a0..5994b451e 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 cf4eb6c29..fee25f3e0 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 1761a613f..f85195bd9 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 9c4951533..d839ff41b 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 f5c220c27..475d2dd9f 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 5bea2bb9f..37468af48 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 0c9d0057c..7bf9a00ff 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 a74d8a63f..27f68a1a2 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 d4f39f3a5..e9bd45410 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 83e3927af..68765b0d3 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 14613e9d8..e488d03b3 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 8b4de71b6..f5ddf4c99 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 dfbab938a..6310ef7de 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 47f4d7b4a..00f9aeedd 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 d23aaa21b..19374f62d 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 5c5491d63..0b3713af3 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 573c9c4f2..9989ae03e 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 515c6e018..55ddb4786 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 8c077af8b..cb26763f3 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 104c92e60..e4b08e700 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 9af4ca1d6..a8d86eb39 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 8df1f794f..fa56757f2 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 e99165f35..f9da0f680 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 8a3195b31..8eca5e751 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 88d64acf4..3a870e85b 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 a5f5f6937..ae0a07c6d 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"});
--
GitLab