From a3d87642cdebb32793258b6fe87c590ee5ceb3a5 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Mon, 7 Apr 2014 10:32:37 +0200
Subject: [PATCH] Import QtQuick 2.2
Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
examples/quick/controls/basiclayouts/main.qml | 2 +-
.../controls/gallery/content/ChildWindow.qml | 2 +-
.../controls/gallery/content/Controls.qml | 2 +-
.../controls/gallery/content/ImageViewer.qml | 2 +-
.../controls/gallery/content/Layouts.qml | 2 +-
.../controls/gallery/content/ModelView.qml | 2 +-
.../quick/controls/gallery/content/Styles.qml | 2 +-
examples/quick/controls/splitview/main.qml | 2 +-
examples/quick/controls/tableview/main.qml | 2 +-
.../texteditor/qml/ToolBarSeparator.qml | 2 +-
.../touch/content/AndroidDelegate.qml | 2 +-
.../controls/touch/content/ButtonPage.qml | 2 +-
.../quick/controls/touch/content/ListPage.qml | 2 +-
.../touch/content/ProgressBarPage.qml | 2 +-
.../controls/touch/content/SliderPage.qml | 2 +-
.../controls/touch/content/TabBarPage.qml | 2 +-
.../controls/touch/content/TextInputPage.qml | 2 +-
examples/quick/controls/touch/main.qml | 2 +-
.../dialogs/systemdialogs/ColorDialogs.qml | 2 +-
.../dialogs/systemdialogs/CustomDialogs.qml | 2 +-
.../dialogs/systemdialogs/FileDialogs.qml | 2 +-
.../dialogs/systemdialogs/MessageDialogs.qml | 2 +-
src/controls/ApplicationWindow.qml | 2 +-
src/controls/BusyIndicator.qml | 2 +-
src/controls/Button.qml | 2 +-
src/controls/CheckBox.qml | 2 +-
src/controls/ComboBox.qml | 4 +--
src/controls/GroupBox.qml | 2 +-
src/controls/Label.qml | 2 +-
src/controls/Menu.qml | 2 +-
src/controls/MenuBar.qml | 2 +-
src/controls/Private/AbstractCheckable.qml | 2 +-
src/controls/Private/BasicButton.qml | 2 +-
src/controls/Private/ColumnMenuContent.qml | 2 +-
src/controls/Private/ContentItem.qml | 2 +-
src/controls/Private/Control.qml | 2 +-
src/controls/Private/FastGlow.qml | 2 +-
src/controls/Private/FocusFrame.qml | 2 +-
src/controls/Private/MenuContentItem.qml | 2 +-
src/controls/Private/MenuContentScroller.qml | 2 +-
src/controls/Private/MenuItemSubControls.qml | 2 +-
src/controls/Private/ModalPopupBehavior.qml | 2 +-
src/controls/Private/ScrollBar.qml | 2 +-
src/controls/Private/ScrollViewHelper.qml | 2 +-
src/controls/Private/SourceProxy.qml | 2 +-
.../Private/StackViewSlideDelegate.qml | 2 +-
src/controls/Private/Style.qml | 2 +-
src/controls/Private/TabBar.qml | 2 +-
src/controls/Private/TableViewSelection.qml | 2 +-
src/controls/Private/TextSingleton.qml | 2 +-
src/controls/ProgressBar.qml | 2 +-
src/controls/RadioButton.qml | 2 +-
src/controls/ScrollView.qml | 2 +-
src/controls/Slider.qml | 2 +-
src/controls/SplitView.qml | 2 +-
src/controls/StackView.qml | 2 +-
src/controls/StackViewDelegate.qml | 2 +-
src/controls/StackViewTransition.qml | 2 +-
src/controls/StatusBar.qml | 2 +-
src/controls/Styles/Base/ButtonStyle.qml | 2 +-
src/controls/Styles/Base/CheckBoxStyle.qml | 2 +-
src/controls/Styles/Base/ComboBoxStyle.qml | 2 +-
src/controls/Styles/Base/FocusFrameStyle.qml | 2 +-
src/controls/Styles/Base/GroupBoxStyle.qml | 2 +-
src/controls/Styles/Base/MenuBarStyle.qml | 2 +-
src/controls/Styles/Base/MenuStyle.qml | 2 +-
src/controls/Styles/Base/ProgressBarStyle.qml | 2 +-
src/controls/Styles/Base/RadioButtonStyle.qml | 2 +-
src/controls/Styles/Base/ScrollViewStyle.qml | 2 +-
src/controls/Styles/Base/SliderStyle.qml | 2 +-
src/controls/Styles/Base/SpinBoxStyle.qml | 2 +-
src/controls/Styles/Base/StatusBarStyle.qml | 2 +-
src/controls/Styles/Base/TabViewStyle.qml | 2 +-
src/controls/Styles/Base/TableViewStyle.qml | 2 +-
src/controls/Styles/Base/TextAreaStyle.qml | 2 +-
src/controls/Styles/Base/TextFieldStyle.qml | 2 +-
src/controls/Styles/Base/ToolBarStyle.qml | 2 +-
src/controls/Styles/Base/ToolButtonStyle.qml | 2 +-
src/controls/Styles/Desktop/ButtonStyle.qml | 2 +-
src/controls/Styles/Desktop/CheckBoxStyle.qml | 2 +-
src/controls/Styles/Desktop/ComboBoxStyle.qml | 2 +-
.../Styles/Desktop/FocusFrameStyle.qml | 2 +-
src/controls/Styles/Desktop/GroupBoxStyle.qml | 2 +-
src/controls/Styles/Desktop/MenuBarStyle.qml | 2 +-
src/controls/Styles/Desktop/MenuStyle.qml | 2 +-
.../Styles/Desktop/ProgressBarStyle.qml | 2 +-
.../Styles/Desktop/RadioButtonStyle.qml | 2 +-
.../Styles/Desktop/ScrollViewStyle.qml | 2 +-
src/controls/Styles/Desktop/SliderStyle.qml | 2 +-
src/controls/Styles/Desktop/SpinBoxStyle.qml | 2 +-
.../Styles/Desktop/StatusBarStyle.qml | 2 +-
src/controls/Styles/Desktop/SwitchStyle.qml | 2 +-
src/controls/Styles/Desktop/TabViewStyle.qml | 2 +-
.../Styles/Desktop/TableViewStyle.qml | 2 +-
src/controls/Styles/Desktop/TextAreaStyle.qml | 2 +-
.../Styles/Desktop/TextFieldStyle.qml | 2 +-
src/controls/Styles/Desktop/ToolBarStyle.qml | 2 +-
.../Styles/Desktop/ToolButtonStyle.qml | 2 +-
src/controls/Switch.qml | 2 +-
src/controls/Tab.qml | 2 +-
src/controls/TabView.qml | 2 +-
src/controls/TableView.qml | 2 +-
src/controls/TableViewColumn.qml | 2 +-
src/controls/TextField.qml | 2 +-
src/controls/ToolBar.qml | 2 +-
src/controls/ToolButton.qml | 2 +-
src/dialogs/DefaultColorDialog.qml | 2 +-
src/dialogs/DefaultDialogWrapper.qml | 2 +-
src/dialogs/DefaultFileDialog.qml | 2 +-
src/dialogs/DefaultFontDialog.qml | 2 +-
src/dialogs/DefaultMessageDialog.qml | 2 +-
src/dialogs/WidgetColorDialog.qml | 2 +-
src/dialogs/WidgetFileDialog.qml | 2 +-
src/dialogs/WidgetMessageDialog.qml | 2 +-
src/dialogs/qml/ColorSlider.qml | 2 +-
src/dialogs/qml/DefaultWindowDecoration.qml | 2 +-
src/dialogs/qquickplatformcolordialog.cpp | 2 +-
src/dialogs/qquickplatformfiledialog.cpp | 2 +-
.../doc/src/snippets/windowconstraints.qml | 2 +-
.../data/activeFocusOnTab.qml | 2 +-
.../data/activefocusontab.qml | 2 +-
.../data/basicapplicationwindow.qml | 2 +-
.../data/groupbox/gb_activeFocusOnTab.qml | 2 +-
.../controls/data/rangemodel/rangemodel.qml | 2 +-
.../auto/controls/data/shortcut/shortcuts.qml | 2 +-
.../data/tableview/table1_qobjectmodel.qml | 2 +-
.../tableview/table2_qabstractitemmodel.qml | 2 +-
.../data/tableview/table3_qobjectlist.qml | 2 +-
.../data/tableview/table4_qstringlist.qml | 2 +-
.../data/tableview/table5_listmodel.qml | 2 +-
.../data/tableview/table6_countmodel.qml | 2 +-
.../data/tableview/table7_arraymodel.qml | 2 +-
.../data/tableview/table8_itemmodel.qml | 2 +-
.../data/tableview/table_activated.qml | 2 +-
.../data/tableview/table_activeFocusOnTab.qml | 2 +-
.../data/tableview/table_buttondelegate.qml | 2 +-
.../data/tableview/table_delegate2.qml | 2 +-
.../data/tableview/table_delegate3.qml | 2 +-
.../data/tableview/table_dynamiccolumns.qml | 2 +-
.../data/tableview/table_mousearea.qml | 2 +-
.../data/tableview/table_multicolumns.qml | 2 +-
.../data/tableview/table_resizecolumns.qml | 2 +-
...tb_checkableActionWithinExclusiveGroup.qml | 2 +-
.../data/toolbutton/tb_exclusivegroup.qml | 2 +-
.../toolbutton/tb_withCheckableAction.qml | 2 +-
.../controls/data/tst_applicationwindow.qml | 10 +++---
.../auto/controls/data/tst_busyindicator.qml | 2 +-
tests/auto/controls/data/tst_button.qml | 6 ++--
tests/auto/controls/data/tst_checkbox.qml | 10 +++---
tests/auto/controls/data/tst_combobox.qml | 8 ++---
tests/auto/controls/data/tst_gridlayout.qml | 2 +-
tests/auto/controls/data/tst_groupbox.qml | 6 ++--
tests/auto/controls/data/tst_label.qml | 4 +--
tests/auto/controls/data/tst_layout.qml | 4 +--
tests/auto/controls/data/tst_menu.qml | 2 +-
tests/auto/controls/data/tst_menubar.qml | 2 +-
tests/auto/controls/data/tst_progressbar.qml | 4 +--
tests/auto/controls/data/tst_radiobutton.qml | 6 ++--
tests/auto/controls/data/tst_rangemodel.qml | 2 +-
tests/auto/controls/data/tst_rowlayout.qml | 12 +++----
tests/auto/controls/data/tst_scrollview.qml | 6 ++--
tests/auto/controls/data/tst_shortcuts.qml | 2 +-
tests/auto/controls/data/tst_slider.qml | 6 ++--
tests/auto/controls/data/tst_spinbox.qml | 8 ++---
tests/auto/controls/data/tst_splitview.qml | 2 +-
tests/auto/controls/data/tst_stack.qml | 8 ++---
tests/auto/controls/data/tst_stackview.qml | 2 +-
tests/auto/controls/data/tst_statusbar.qml | 4 +--
tests/auto/controls/data/tst_styles.qml | 34 +++++++++----------
tests/auto/controls/data/tst_switch.qml | 6 ++--
tests/auto/controls/data/tst_tab.qml | 2 +-
tests/auto/controls/data/tst_tableview.qml | 14 ++++----
.../controls/data/tst_tableviewcolumn.qml | 2 +-
tests/auto/controls/data/tst_tabview.qml | 16 ++++-----
tests/auto/controls/data/tst_textarea.qml | 4 +--
tests/auto/controls/data/tst_textfield.qml | 6 ++--
tests/auto/controls/data/tst_toolbar.qml | 4 +--
tests/auto/controls/data/tst_toolbutton.qml | 4 +--
tests/manual/ApplicationWindow/main.qml | 2 +-
tests/manual/ContextMenu.qml | 2 +-
tests/manual/Layout.qml | 2 +-
tests/manual/StackView.qml | 2 +-
tests/manual/WindowContextMenu.qml | 2 +-
tests/manual/baselines/main.qml | 2 +-
tests/manual/combobox/main.qml | 2 +-
tests/manual/keynavigation.qml | 2 +-
tests/manual/popupwindowkeyevents.qml | 2 +-
tests/manual/scrollview/main.qml | 2 +-
tests/manual/splitter.qml | 2 +-
tests/manual/stackview/ButtonMenu.qml | 2 +-
tests/manual/stackview/View.qml | 2 +-
tests/manual/stackview/main.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 +-
.../testbench/content/PropertyLayouts.qml | 2 +-
tests/manual/testbench/main.qml | 20 +++++------
198 files changed, 280 insertions(+), 280 deletions(-)
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index 18883d9a9..ecbbb75a1 100644
--- a/examples/quick/controls/basiclayouts/main.qml
+++ b/examples/quick/controls/basiclayouts/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/gallery/content/ChildWindow.qml b/examples/quick/controls/gallery/content/ChildWindow.qml
index a645e4766..08925f632 100644
--- a/examples/quick/controls/gallery/content/ChildWindow.qml
+++ b/examples/quick/controls/gallery/content/ChildWindow.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml
index 6817d9b72..b7e461881 100644
--- a/examples/quick/controls/gallery/content/Controls.qml
+++ b/examples/quick/controls/gallery/content/Controls.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/gallery/content/ImageViewer.qml b/examples/quick/controls/gallery/content/ImageViewer.qml
index 0b045bf6a..01f24ab33 100644
--- a/examples/quick/controls/gallery/content/ImageViewer.qml
+++ b/examples/quick/controls/gallery/content/ImageViewer.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
Window {
diff --git a/examples/quick/controls/gallery/content/Layouts.qml b/examples/quick/controls/gallery/content/Layouts.qml
index db9ae0f08..0cb234c39 100644
--- a/examples/quick/controls/gallery/content/Layouts.qml
+++ b/examples/quick/controls/gallery/content/Layouts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml
index 5bbb34f4f..be334458d 100644
--- a/examples/quick/controls/gallery/content/ModelView.qml
+++ b/examples/quick/controls/gallery/content/ModelView.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
//import QtQuick.XmlListModel 2.1
diff --git a/examples/quick/controls/gallery/content/Styles.qml b/examples/quick/controls/gallery/content/Styles.qml
index 81b46f636..ed237d82b 100644
--- a/examples/quick/controls/gallery/content/Styles.qml
+++ b/examples/quick/controls/gallery/content/Styles.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Particles 2.0
diff --git a/examples/quick/controls/splitview/main.qml b/examples/quick/controls/splitview/main.qml
index 395188ce7..d93c74d3d 100644
--- a/examples/quick/controls/splitview/main.qml
+++ b/examples/quick/controls/splitview/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/tableview/main.qml b/examples/quick/controls/tableview/main.qml
index d15b6f65b..553187b62 100644
--- a/examples/quick/controls/tableview/main.qml
+++ b/examples/quick/controls/tableview/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
import QtQuick.XmlListModel 2.0
diff --git a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml b/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
index 40a2bc580..b69849762 100644
--- a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
+++ b/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
Item {
width: 8
diff --git a/examples/quick/controls/touch/content/AndroidDelegate.qml b/examples/quick/controls/touch/content/AndroidDelegate.qml
index 36a439a8e..21ee8e680 100644
--- a/examples/quick/controls/touch/content/AndroidDelegate.qml
+++ b/examples/quick/controls/touch/content/AndroidDelegate.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
Item {
id: root
diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml
index 90a8a69c5..4cfb56948 100644
--- a/examples/quick/controls/touch/content/ButtonPage.qml
+++ b/examples/quick/controls/touch/content/ButtonPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/ListPage.qml b/examples/quick/controls/touch/content/ListPage.qml
index 1edd17d05..65dc99f51 100644
--- a/examples/quick/controls/touch/content/ListPage.qml
+++ b/examples/quick/controls/touch/content/ListPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quick/controls/touch/content/ProgressBarPage.qml
index 53882897f..019d72061 100644
--- a/examples/quick/controls/touch/content/ProgressBarPage.qml
+++ b/examples/quick/controls/touch/content/ProgressBarPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quick/controls/touch/content/SliderPage.qml
index 719adf440..91f1504d8 100644
--- a/examples/quick/controls/touch/content/SliderPage.qml
+++ b/examples/quick/controls/touch/content/SliderPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml
index 7070af47f..c9bebccd3 100644
--- a/examples/quick/controls/touch/content/TabBarPage.qml
+++ b/examples/quick/controls/touch/content/TabBarPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quick/controls/touch/content/TextInputPage.qml
index ba9aa1d6f..0eeea03a2 100644
--- a/examples/quick/controls/touch/content/TextInputPage.qml
+++ b/examples/quick/controls/touch/content/TextInputPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml
index 163ec9372..c794f7dcc 100644
--- a/examples/quick/controls/touch/main.qml
+++ b/examples/quick/controls/touch/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import "content"
diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
index 08c3ffe97..3b0c84c6a 100644
--- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
diff --git a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml b/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
index 389979ef5..81c06b7e6 100644
--- a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
index ccfff2d6b..05e3b5b07 100644
--- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.0
diff --git a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
index 6be997420..619a0b801 100644
--- a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.0
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index ec40d4feb..728342877 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick.Window 2.1
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/BusyIndicator.qml b/src/controls/BusyIndicator.qml
index 01820bb82..25eb6dc50 100644
--- a/src/controls/BusyIndicator.qml
+++ b/src/controls/BusyIndicator.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Button.qml b/src/controls/Button.qml
index 1875e423a..afd7f3818 100644
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml
index e96e64fd6..7249bd001 100644
--- a/src/controls/CheckBox.qml
+++ b/src/controls/CheckBox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index 5ce5bf071..20c4e1e56 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
@@ -203,7 +203,7 @@ Control {
\note This property is only applied when \l editable is \c true
\qml
- import QtQuick 2.1
+ import QtQuick 2.2
import QtQuick.Controls 1.1
ComboBox {
diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml
index 12959d16f..5b3d31f64 100644
--- a/src/controls/GroupBox.qml
+++ b/src/controls/GroupBox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/Label.qml b/src/controls/Label.qml
index 658772a83..7ec474902 100644
--- a/src/controls/Label.qml
+++ b/src/controls/Label.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
/*!
\qmltype Label
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml
index d7aa4a0a1..4794c17fa 100644
--- a/src/controls/Menu.qml
+++ b/src/controls/Menu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index f294d54eb..10f4ac254 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Private/AbstractCheckable.qml b/src/controls/Private/AbstractCheckable.qml
index 1d69d8696..4a9547a75 100644
--- a/src/controls/Private/AbstractCheckable.qml
+++ b/src/controls/Private/AbstractCheckable.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
/*!
diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml
index 44ec21109..8bbc0b7e9 100644
--- a/src/controls/Private/BasicButton.qml
+++ b/src/controls/Private/BasicButton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/Private/ColumnMenuContent.qml b/src/controls/Private/ColumnMenuContent.qml
index 40fc907b6..754ff141a 100644
--- a/src/controls/Private/ColumnMenuContent.qml
+++ b/src/controls/Private/ColumnMenuContent.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Item {
diff --git a/src/controls/Private/ContentItem.qml b/src/controls/Private/ContentItem.qml
index edfd309d2..1e386424a 100644
--- a/src/controls/Private/ContentItem.qml
+++ b/src/controls/Private/ContentItem.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Layouts 1.1
Item {
diff --git a/src/controls/Private/Control.qml b/src/controls/Private/Control.qml
index 0ce8908fb..a520e3727 100644
--- a/src/controls/Private/Control.qml
+++ b/src/controls/Private/Control.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls.Styles 1.1
/*!
diff --git a/src/controls/Private/FastGlow.qml b/src/controls/Private/FastGlow.qml
index f4bd2c742..5b3b48814 100644
--- a/src/controls/Private/FastGlow.qml
+++ b/src/controls/Private/FastGlow.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.2
Item {
id: rootItem
diff --git a/src/controls/Private/FocusFrame.qml b/src/controls/Private/FocusFrame.qml
index 449d06b1a..1ad0af029 100644
--- a/src/controls/Private/FocusFrame.qml
+++ b/src/controls/Private/FocusFrame.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Private/MenuContentItem.qml b/src/controls/Private/MenuContentItem.qml
index f55077a0e..678426d54 100644
--- a/src/controls/Private/MenuContentItem.qml
+++ b/src/controls/Private/MenuContentItem.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/Private/MenuContentScroller.qml b/src/controls/Private/MenuContentScroller.qml
index e18132bb0..0530cf6a4 100644
--- a/src/controls/Private/MenuContentScroller.qml
+++ b/src/controls/Private/MenuContentScroller.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
MouseArea {
diff --git a/src/controls/Private/MenuItemSubControls.qml b/src/controls/Private/MenuItemSubControls.qml
index af62bf5be..d5487bd72 100644
--- a/src/controls/Private/MenuItemSubControls.qml
+++ b/src/controls/Private/MenuItemSubControls.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
QtObject {
property Component background: null
diff --git a/src/controls/Private/ModalPopupBehavior.qml b/src/controls/Private/ModalPopupBehavior.qml
index 8b78cb31b..bd1535d4f 100644
--- a/src/controls/Private/ModalPopupBehavior.qml
+++ b/src/controls/Private/ModalPopupBehavior.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
// KNOWN ISSUES
// none
diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml
index 1734e4961..0bebd1eba 100644
--- a/src/controls/Private/ScrollBar.qml
+++ b/src/controls/Private/ScrollBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 3f1166f3e..a54559386 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Private/SourceProxy.qml b/src/controls/Private/SourceProxy.qml
index 1cf03f313..0b91d3170 100644
--- a/src/controls/Private/SourceProxy.qml
+++ b/src/controls/Private/SourceProxy.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.2
Item {
id: rootItem
diff --git a/src/controls/Private/StackViewSlideDelegate.qml b/src/controls/Private/StackViewSlideDelegate.qml
index 88530e696..df5b60d2f 100644
--- a/src/controls/Private/StackViewSlideDelegate.qml
+++ b/src/controls/Private/StackViewSlideDelegate.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
/*!
diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml
index ed31536dd..5d2822b93 100644
--- a/src/controls/Private/Style.qml
+++ b/src/controls/Private/Style.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Private/TabBar.qml b/src/controls/Private/TabBar.qml
index 6dc98d1a9..2af7d23ce 100644
--- a/src/controls/Private/TabBar.qml
+++ b/src/controls/Private/TabBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
/*!
diff --git a/src/controls/Private/TableViewSelection.qml b/src/controls/Private/TableViewSelection.qml
index 5ed5b0d4d..e15a9ab86 100644
--- a/src/controls/Private/TableViewSelection.qml
+++ b/src/controls/Private/TableViewSelection.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
QtObject {
diff --git a/src/controls/Private/TextSingleton.qml b/src/controls/Private/TextSingleton.qml
index 7a3f07cdd..c32c89f21 100644
--- a/src/controls/Private/TextSingleton.qml
+++ b/src/controls/Private/TextSingleton.qml
@@ -40,5 +40,5 @@
****************************************************************************/
pragma Singleton
-import QtQuick 2.1
+import QtQuick 2.2
Text {}
diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml
index 523f3978e..01deac63e 100644
--- a/src/controls/ProgressBar.qml
+++ b/src/controls/ProgressBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml
index 2947093d2..420ef2be7 100644
--- a/src/controls/RadioButton.qml
+++ b/src/controls/RadioButton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index af6a077e0..c72277d8f 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index c2869563a..3dd70475d 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml
index b079bc503..5318105c7 100644
--- a/src/controls/SplitView.qml
+++ b/src/controls/SplitView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import QtQuick.Controls.Private 1.0 as Private
diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml
index 11e2d1825..e19189d0d 100644
--- a/src/controls/StackView.qml
+++ b/src/controls/StackView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/StackViewDelegate.qml b/src/controls/StackViewDelegate.qml
index 40f9437c8..95c42f7a4 100644
--- a/src/controls/StackViewDelegate.qml
+++ b/src/controls/StackViewDelegate.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
/*!
\qmltype StackViewDelegate
diff --git a/src/controls/StackViewTransition.qml b/src/controls/StackViewTransition.qml
index e58ad3f34..1c5895c51 100644
--- a/src/controls/StackViewTransition.qml
+++ b/src/controls/StackViewTransition.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
ParallelAnimation {
id: root
diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml
index 5993ce464..af5870b03 100644
--- a/src/controls/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index 92ee6395b..1ab680d7c 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml
index c61746f51..f7e9bc7e9 100644
--- a/src/controls/Styles/Base/CheckBoxStyle.qml
+++ b/src/controls/Styles/Base/CheckBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Window 2.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index 55e604252..9a0c80a62 100644
--- a/src/controls/Styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/Styles/Base/FocusFrameStyle.qml b/src/controls/Styles/Base/FocusFrameStyle.qml
index 27edf11c5..d935251b0 100644
--- a/src/controls/Styles/Base/FocusFrameStyle.qml
+++ b/src/controls/Styles/Base/FocusFrameStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml
index c0c08d562..45cce7c9e 100644
--- a/src/controls/Styles/Base/GroupBoxStyle.qml
+++ b/src/controls/Styles/Base/GroupBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml
index 396f35419..da8e1f97d 100644
--- a/src/controls/Styles/Base/MenuBarStyle.qml
+++ b/src/controls/Styles/Base/MenuBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml
index 67aed5e5d..d1391ea1a 100644
--- a/src/controls/Styles/Base/MenuStyle.qml
+++ b/src/controls/Styles/Base/MenuStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml
index d0fa9a355..de05faa5d 100644
--- a/src/controls/Styles/Base/ProgressBarStyle.qml
+++ b/src/controls/Styles/Base/ProgressBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml
index 74fc0558d..c697decc7 100644
--- a/src/controls/Styles/Base/RadioButtonStyle.qml
+++ b/src/controls/Styles/Base/RadioButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
index 1944ed43d..8e3e5efcb 100644
--- a/src/controls/Styles/Base/ScrollViewStyle.qml
+++ b/src/controls/Styles/Base/ScrollViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index a62230bcf..11f3e15a5 100644
--- a/src/controls/Styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml
index 183b36b8b..1d889b908 100644
--- a/src/controls/Styles/Base/SpinBoxStyle.qml
+++ b/src/controls/Styles/Base/SpinBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/StatusBarStyle.qml b/src/controls/Styles/Base/StatusBarStyle.qml
index aa8f6d6e9..8e7505198 100644
--- a/src/controls/Styles/Base/StatusBarStyle.qml
+++ b/src/controls/Styles/Base/StatusBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml
index 448a2feb5..758b6be6c 100644
--- a/src/controls/Styles/Base/TabViewStyle.qml
+++ b/src/controls/Styles/Base/TabViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml
index bf8af48a3..31ea5073d 100644
--- a/src/controls/Styles/Base/TableViewStyle.qml
+++ b/src/controls/Styles/Base/TableViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/TextAreaStyle.qml b/src/controls/Styles/Base/TextAreaStyle.qml
index c974c01da..91fc94897 100644
--- a/src/controls/Styles/Base/TextAreaStyle.qml
+++ b/src/controls/Styles/Base/TextAreaStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml
index 1b732cee7..3e371c8d4 100644
--- a/src/controls/Styles/Base/TextFieldStyle.qml
+++ b/src/controls/Styles/Base/TextFieldStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/ToolBarStyle.qml b/src/controls/Styles/Base/ToolBarStyle.qml
index ca5d93fba..82ad4f1f7 100644
--- a/src/controls/Styles/Base/ToolBarStyle.qml
+++ b/src/controls/Styles/Base/ToolBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml
index dcdfe4dee..9e4f3ccc8 100644
--- a/src/controls/Styles/Base/ToolButtonStyle.qml
+++ b/src/controls/Styles/Base/ToolButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/ButtonStyle.qml b/src/controls/Styles/Desktop/ButtonStyle.qml
index 33e8f0eed..07e1031b9 100644
--- a/src/controls/Styles/Desktop/ButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml
index 819c6a819..003d964aa 100644
--- a/src/controls/Styles/Desktop/CheckBoxStyle.qml
+++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml
index 12376ff7d..b01940d11 100644
--- a/src/controls/Styles/Desktop/ComboBoxStyle.qml
+++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/FocusFrameStyle.qml b/src/controls/Styles/Desktop/FocusFrameStyle.qml
index 0bea860ee..e52235edb 100644
--- a/src/controls/Styles/Desktop/FocusFrameStyle.qml
+++ b/src/controls/Styles/Desktop/FocusFrameStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml
index cfe02d3f1..75c9de8fd 100644
--- a/src/controls/Styles/Desktop/GroupBoxStyle.qml
+++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/MenuBarStyle.qml b/src/controls/Styles/Desktop/MenuBarStyle.qml
index 6135bbdb1..6218ce9bf 100644
--- a/src/controls/Styles/Desktop/MenuBarStyle.qml
+++ b/src/controls/Styles/Desktop/MenuBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import "." as Desktop
diff --git a/src/controls/Styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml
index 6cf67b1c7..90ffa76d3 100644
--- a/src/controls/Styles/Desktop/MenuStyle.qml
+++ b/src/controls/Styles/Desktop/MenuStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/ProgressBarStyle.qml b/src/controls/Styles/Desktop/ProgressBarStyle.qml
index 70fa04024..633002a89 100644
--- a/src/controls/Styles/Desktop/ProgressBarStyle.qml
+++ b/src/controls/Styles/Desktop/ProgressBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml
index 4a00ee22a..55d3b60e6 100644
--- a/src/controls/Styles/Desktop/RadioButtonStyle.qml
+++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/ScrollViewStyle.qml b/src/controls/Styles/Desktop/ScrollViewStyle.qml
index 22c284416..8fd559f4c 100644
--- a/src/controls/Styles/Desktop/ScrollViewStyle.qml
+++ b/src/controls/Styles/Desktop/ScrollViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/SliderStyle.qml b/src/controls/Styles/Desktop/SliderStyle.qml
index 022570b25..d11baad56 100644
--- a/src/controls/Styles/Desktop/SliderStyle.qml
+++ b/src/controls/Styles/Desktop/SliderStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml
index 18bfec36f..56f1f62e6 100644
--- a/src/controls/Styles/Desktop/SpinBoxStyle.qml
+++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/StatusBarStyle.qml b/src/controls/Styles/Desktop/StatusBarStyle.qml
index 1a1c687ea..0c4ba0209 100644
--- a/src/controls/Styles/Desktop/StatusBarStyle.qml
+++ b/src/controls/Styles/Desktop/StatusBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/SwitchStyle.qml b/src/controls/Styles/Desktop/SwitchStyle.qml
index df9dd5bf9..54ce05538 100644
--- a/src/controls/Styles/Desktop/SwitchStyle.qml
+++ b/src/controls/Styles/Desktop/SwitchStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/Styles/Desktop/TabViewStyle.qml b/src/controls/Styles/Desktop/TabViewStyle.qml
index f20c32cd7..bde5e3f49 100644
--- a/src/controls/Styles/Desktop/TabViewStyle.qml
+++ b/src/controls/Styles/Desktop/TabViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml
index b9891b317..814618de6 100644
--- a/src/controls/Styles/Desktop/TableViewStyle.qml
+++ b/src/controls/Styles/Desktop/TableViewStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import "."
diff --git a/src/controls/Styles/Desktop/TextAreaStyle.qml b/src/controls/Styles/Desktop/TextAreaStyle.qml
index dbcd4dce3..201dafa94 100644
--- a/src/controls/Styles/Desktop/TextAreaStyle.qml
+++ b/src/controls/Styles/Desktop/TextAreaStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml
index 0ca0d743d..77de5e5ab 100644
--- a/src/controls/Styles/Desktop/TextFieldStyle.qml
+++ b/src/controls/Styles/Desktop/TextFieldStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/ToolBarStyle.qml b/src/controls/Styles/Desktop/ToolBarStyle.qml
index 4f4b451e1..eac5405ff 100644
--- a/src/controls/Styles/Desktop/ToolBarStyle.qml
+++ b/src/controls/Styles/Desktop/ToolBarStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/ToolButtonStyle.qml b/src/controls/Styles/Desktop/ToolButtonStyle.qml
index d690a5775..cc5736b12 100644
--- a/src/controls/Styles/Desktop/ToolButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ToolButtonStyle.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Switch.qml b/src/controls/Switch.qml
index 668ee22f4..f81991afa 100644
--- a/src/controls/Switch.qml
+++ b/src/controls/Switch.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Tab.qml b/src/controls/Tab.qml
index cfd757c97..8957806a6 100644
--- a/src/controls/Tab.qml
+++ b/src/controls/Tab.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
/*!
\qmltype Tab
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index fb31ca670..b185c24c4 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 8006c443d..a3da455e9 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.1
diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml
index 3336470e3..32068f226 100644
--- a/src/controls/TableViewColumn.qml
+++ b/src/controls/TableViewColumn.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
/*!
\qmltype TableViewColumn
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index 7217caa21..49393d3f8 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -381,7 +381,7 @@ Control {
integers between 11 and 31 into the text input:
\code
- import QtQuick 2.1
+ import QtQuick 2.2
import QtQuick.Controls 1.1
TextField {
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index caf1d46fd..e3d5d3ea9 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index 24ca162c3..f1dec7202 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml
index 1b5f74858..14e1323e9 100644
--- a/src/dialogs/DefaultColorDialog.qml
+++ b/src/dialogs/DefaultColorDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.0
import QtQuick.Window 2.1
diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml
index 2cf157ab8..067771416 100644
--- a/src/dialogs/DefaultDialogWrapper.qml
+++ b/src/dialogs/DefaultDialogWrapper.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml
index aa9efddfc..767939b36 100644
--- a/src/dialogs/DefaultFileDialog.qml
+++ b/src/dialogs/DefaultFileDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0 as ControlsPrivate
import QtQuick.Dialogs 1.1
diff --git a/src/dialogs/DefaultFontDialog.qml b/src/dialogs/DefaultFontDialog.qml
index 881bf664b..2518ce95d 100644
--- a/src/dialogs/DefaultFontDialog.qml
+++ b/src/dialogs/DefaultFontDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.0
import QtQuick.Dialogs 1.1
diff --git a/src/dialogs/DefaultMessageDialog.qml b/src/dialogs/DefaultMessageDialog.qml
index 0b46f9f3a..932dbfe35 100644
--- a/src/dialogs/DefaultMessageDialog.qml
+++ b/src/dialogs/DefaultMessageDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.1
diff --git a/src/dialogs/WidgetColorDialog.qml b/src/dialogs/WidgetColorDialog.qml
index ed7c7ab77..c22cb5581 100644
--- a/src/dialogs/WidgetColorDialog.qml
+++ b/src/dialogs/WidgetColorDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.PrivateWidgets 1.0
QtColorDialog { }
diff --git a/src/dialogs/WidgetFileDialog.qml b/src/dialogs/WidgetFileDialog.qml
index c8f59d20a..228f84e86 100644
--- a/src/dialogs/WidgetFileDialog.qml
+++ b/src/dialogs/WidgetFileDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.PrivateWidgets 1.0
QtFileDialog { }
diff --git a/src/dialogs/WidgetMessageDialog.qml b/src/dialogs/WidgetMessageDialog.qml
index 8bc3eccfd..88a40d594 100644
--- a/src/dialogs/WidgetMessageDialog.qml
+++ b/src/dialogs/WidgetMessageDialog.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.PrivateWidgets 1.1
QtMessageDialog { }
diff --git a/src/dialogs/qml/ColorSlider.qml b/src/dialogs/qml/ColorSlider.qml
index 8fc971738..219da0cb3 100644
--- a/src/dialogs/qml/ColorSlider.qml
+++ b/src/dialogs/qml/ColorSlider.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
Item {
id: colorSlider
diff --git a/src/dialogs/qml/DefaultWindowDecoration.qml b/src/dialogs/qml/DefaultWindowDecoration.qml
index ec930101d..64eb4387e 100644
--- a/src/dialogs/qml/DefaultWindowDecoration.qml
+++ b/src/dialogs/qml/DefaultWindowDecoration.qml
@@ -38,7 +38,7 @@
**
*****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
Rectangle {
color: "#80000000"
diff --git a/src/dialogs/qquickplatformcolordialog.cpp b/src/dialogs/qquickplatformcolordialog.cpp
index 9e4083c8c..01430a503 100644
--- a/src/dialogs/qquickplatformcolordialog.cpp
+++ b/src/dialogs/qquickplatformcolordialog.cpp
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
chooses a color:
\qml
- import QtQuick 2.1
+ import QtQuick 2.2
import QtQuick.Dialogs 1.0
ColorDialog {
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp
index 99bfc3924..5a969adb0 100644
--- a/src/dialogs/qquickplatformfiledialog.cpp
+++ b/src/dialogs/qquickplatformfiledialog.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
chooses a file:
\qml
- import QtQuick 2.1
+ import QtQuick 2.2
import QtQuick.Dialogs 1.0
FileDialog {
diff --git a/src/layouts/doc/src/snippets/windowconstraints.qml b/src/layouts/doc/src/snippets/windowconstraints.qml
index d9411c334..5daf8a08e 100644
--- a/src/layouts/doc/src/snippets/windowconstraints.qml
+++ b/src/layouts/doc/src/snippets/windowconstraints.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml
index 42f785ce4..a434beb2c 100644
--- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml
+++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Item {
diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml
index d4e813019..c369619e3 100644
--- a/tests/auto/applicationwindow/data/activefocusontab.qml
+++ b/tests/auto/applicationwindow/data/activefocusontab.qml
@@ -38,7 +38,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
ApplicationWindow {
diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml
index 71bf9983f..194411dbf 100644
--- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml
@@ -38,7 +38,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
ApplicationWindow {
diff --git a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml
index e3d69aa33..af7845190 100644
--- a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml
+++ b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Column {
diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml
index 74f5a23bd..1c285de1c 100644
--- a/tests/auto/controls/data/rangemodel/rangemodel.qml
+++ b/tests/auto/controls/data/rangemodel/rangemodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/tests/auto/controls/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml
index daf111035..c0dd6cbcd 100644
--- a/tests/auto/controls/data/shortcut/shortcuts.qml
+++ b/tests/auto/controls/data/shortcut/shortcuts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Rectangle {
diff --git a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml
index 1244b4052..1c8b06b24 100644
--- a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml
+++ b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
diff --git a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml
index eda5ee721..5f343ff97 100644
--- a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml
+++ b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
diff --git a/tests/auto/controls/data/tableview/table3_qobjectlist.qml b/tests/auto/controls/data/tableview/table3_qobjectlist.qml
index 1cfcc2a6a..9cd36cbb4 100644
--- a/tests/auto/controls/data/tableview/table3_qobjectlist.qml
+++ b/tests/auto/controls/data/tableview/table3_qobjectlist.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
diff --git a/tests/auto/controls/data/tableview/table4_qstringlist.qml b/tests/auto/controls/data/tableview/table4_qstringlist.qml
index 0d3284d44..61416ea1e 100644
--- a/tests/auto/controls/data/tableview/table4_qstringlist.qml
+++ b/tests/auto/controls/data/tableview/table4_qstringlist.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
diff --git a/tests/auto/controls/data/tableview/table5_listmodel.qml b/tests/auto/controls/data/tableview/table5_listmodel.qml
index 61ed542e8..b7ac4ca7b 100644
--- a/tests/auto/controls/data/tableview/table5_listmodel.qml
+++ b/tests/auto/controls/data/tableview/table5_listmodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml
index 05d574351..cd2d26b07 100644
--- a/tests/auto/controls/data/tableview/table6_countmodel.qml
+++ b/tests/auto/controls/data/tableview/table6_countmodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml
index 079f32134..00dd99c01 100644
--- a/tests/auto/controls/data/tableview/table7_arraymodel.qml
+++ b/tests/auto/controls/data/tableview/table7_arraymodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml
index 9022d8ff4..23c523faa 100644
--- a/tests/auto/controls/data/tableview/table8_itemmodel.qml
+++ b/tests/auto/controls/data/tableview/table8_itemmodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_activated.qml b/tests/auto/controls/data/tableview/table_activated.qml
index 3b458837d..b4cd13aa2 100644
--- a/tests/auto/controls/data/tableview/table_activated.qml
+++ b/tests/auto/controls/data/tableview/table_activated.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml b/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml
index d0dc0079f..28b1198cf 100644
--- a/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml
+++ b/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Item {
diff --git a/tests/auto/controls/data/tableview/table_buttondelegate.qml b/tests/auto/controls/data/tableview/table_buttondelegate.qml
index f683aeac0..93536bfe1 100644
--- a/tests/auto/controls/data/tableview/table_buttondelegate.qml
+++ b/tests/auto/controls/data/tableview/table_buttondelegate.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_delegate2.qml b/tests/auto/controls/data/tableview/table_delegate2.qml
index c9ad3d5ee..b55a4c6c2 100644
--- a/tests/auto/controls/data/tableview/table_delegate2.qml
+++ b/tests/auto/controls/data/tableview/table_delegate2.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_delegate3.qml b/tests/auto/controls/data/tableview/table_delegate3.qml
index e8922dd93..7d055df3c 100644
--- a/tests/auto/controls/data/tableview/table_delegate3.qml
+++ b/tests/auto/controls/data/tableview/table_delegate3.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml
index 421a1ce97..7709aea88 100644
--- a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml
+++ b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_mousearea.qml b/tests/auto/controls/data/tableview/table_mousearea.qml
index f63149ab5..e5fd598e5 100644
--- a/tests/auto/controls/data/tableview/table_mousearea.qml
+++ b/tests/auto/controls/data/tableview/table_mousearea.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_multicolumns.qml b/tests/auto/controls/data/tableview/table_multicolumns.qml
index 58af9df6a..cb81523d0 100644
--- a/tests/auto/controls/data/tableview/table_multicolumns.qml
+++ b/tests/auto/controls/data/tableview/table_multicolumns.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
TableView {
diff --git a/tests/auto/controls/data/tableview/table_resizecolumns.qml b/tests/auto/controls/data/tableview/table_resizecolumns.qml
index 95825d725..864270130 100644
--- a/tests/auto/controls/data/tableview/table_resizecolumns.qml
+++ b/tests/auto/controls/data/tableview/table_resizecolumns.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1;
+import QtQuick 2.2;
import QtQuick.Controls 1.1;
TableView {
diff --git a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml
index 6b9760d04..788b272f2 100644
--- a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml
+++ b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Row {
diff --git a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml
index 4f543fc1f..42a51d57b 100644
--- a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml
+++ b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Row {
diff --git a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml
index 5b68153e3..ae454a736 100644
--- a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml
+++ b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Row {
diff --git a/tests/auto/controls/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml
index 7450c705e..47e1c2186 100644
--- a/tests/auto/controls/data/tst_applicationwindow.qml
+++ b/tests/auto/controls/data/tst_applicationwindow.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -55,7 +55,7 @@ TestCase {
height:400
function test_minimumHeight() {
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
ApplicationWindow { \
visible: true; \
@@ -148,7 +148,7 @@ TestCase {
}
}
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
import QtQuick.Layouts 1.1; \
ApplicationWindow { \
@@ -169,7 +169,7 @@ TestCase {
}
function test_minimumSizeLargerThan_MaximumSize() {
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
import QtQuick.Layouts 1.1; \
ApplicationWindow { \
@@ -207,7 +207,7 @@ TestCase {
}
function test_defaultSizeHints() {
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
import QtQuick.Layouts 1.1; \
ApplicationWindow { \
diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml
index 912ed7faf..c949788b5 100644
--- a/tests/auto/controls/data/tst_busyindicator.qml
+++ b/tests/auto/controls/data/tst_busyindicator.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
Item {
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index ee555ac01..ad06045e4 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -79,7 +79,7 @@ TestCase {
function test_action() {
var test_actionStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
property var testAction: Action { \
@@ -126,7 +126,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 278fb0e15..dc52238be 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -169,7 +169,7 @@ Item {
}
function test_check_keep_binding() {
- var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n"
+ "Row { \n"
+ " property alias checkBox1: checkBox1 \n"
+ " property alias checkBox2: checkBox2 \n"
@@ -188,7 +188,7 @@ Item {
}
function test_checkState_keep_binding() {
- var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n"
+ "Row { \n"
+ " property alias checkBox1: checkBox1 \n"
+ " property alias checkBox2: checkBox2 \n"
@@ -208,7 +208,7 @@ Item {
function test_exclusiveGroup() {
- var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n"
+ "Row { \n"
+ " property alias checkBox1: checkBox1 \n"
+ " property alias checkBox2: checkBox2 \n"
@@ -281,7 +281,7 @@ Item {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 4d5117fbd..721284cf9 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -65,7 +65,7 @@ TestCase {
}
function init() {
- model = Qt.createQmlObject("import QtQuick 2.1; ListModel {}", testCase, '')
+ model = Qt.createQmlObject("import QtQuick 2.2; ListModel {}", testCase, '')
model.append({ text: "Banana", color: "Yellow" })
model.append({ text: "Apple", color: "Green" })
model.append({ text: "Coconut", color: "Brown" })
@@ -152,7 +152,7 @@ TestCase {
}
function test_validator() {
- var comboBox = Qt.createQmlObject('import QtQuick 2.1; \
+ var comboBox = Qt.createQmlObject('import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
ComboBox { \
editable: true; \
@@ -419,7 +419,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_gridlayout.qml b/tests/auto/controls/data/tst_gridlayout.qml
index 7ca13b6b0..a595cca17 100644
--- a/tests/auto/controls/data/tst_gridlayout.qml
+++ b/tests/auto/controls/data/tst_gridlayout.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Layouts 1.1
diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml
index d5986eb76..977527efa 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/controls/data/tst_groupbox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
@@ -95,14 +95,14 @@ TestCase {
compare(groupbox.width, 16)
compare(groupbox.height, 16)
- var content = Qt.createQmlObject('import QtQuick 2.1; Rectangle {implicitWidth:100 ; implicitHeight:30}', container, '')
+ var content = Qt.createQmlObject('import QtQuick 2.2; Rectangle {implicitWidth:100 ; implicitHeight:30}', container, '')
content.parent = groupbox.contentItem
compare(groupbox.implicitWidth, 116)
compare(groupbox.implicitHeight, 46)
content.parent = null
content.destroy()
- content = Qt.createQmlObject('import QtQuick 2.1; Rectangle {width:20 ; height:20}', container, '')
+ content = Qt.createQmlObject('import QtQuick 2.2; Rectangle {width:20 ; height:20}', container, '')
content.parent = groupbox.contentItem
compare(groupbox.implicitWidth, 36)
compare(groupbox.implicitHeight, 36)
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index c6d200490..4a6e296c4 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -63,7 +63,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_layout.qml b/tests/auto/controls/data/tst_layout.qml
index 8ce582dbc..eac909425 100644
--- a/tests/auto/controls/data/tst_layout.qml
+++ b/tests/auto/controls/data/tst_layout.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
TestCase {
@@ -50,7 +50,7 @@ TestCase {
function test_invalidParent() {
ignoreWarning('Layout must be attached to Item elements')
- var object = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Layouts 1.0; QtObject { Layout.fillWidth: true }', testCase, '');
+ var object = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Layouts 1.0; QtObject { Layout.fillWidth: true }', testCase, '');
object.destroy()
}
}
diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml
index d91580806..c53ae22c0 100644
--- a/tests/auto/controls/data/tst_menu.qml
+++ b/tests/auto/controls/data/tst_menu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Controls 1.1
diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml
index 8f46108cd..4c2c25cf0 100644
--- a/tests/auto/controls/data/tst_menubar.qml
+++ b/tests/auto/controls/data/tst_menubar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index b6b494fef..9f22300a3 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -134,7 +134,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index c8f759127..6a6efcd49 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -139,7 +139,7 @@ Item {
}
function test_exclusiveGroup() {
- var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n"
+ "Row { \n"
+ " property alias radioButton1: radioButton1 \n"
+ " property alias radioButton2: radioButton2 \n"
@@ -195,7 +195,7 @@ Item {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_rangemodel.qml b/tests/auto/controls/data/tst_rangemodel.qml
index 2ba049263..bbb0e3bfb 100644
--- a/tests/auto/controls/data/tst_rangemodel.qml
+++ b/tests/auto/controls/data/tst_rangemodel.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_rowlayout.qml b/tests/auto/controls/data/tst_rowlayout.qml
index 9db6c803e..7daee7e8a 100644
--- a/tests/auto/controls/data/tst_rowlayout.qml
+++ b/tests/auto/controls/data/tst_rowlayout.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Layouts 1.0
@@ -60,7 +60,7 @@ Item {
function test_fixedAndExpanding() {
var test_layoutStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Layouts 1.0; \
RowLayout { \
id: row; \
@@ -98,7 +98,7 @@ Item {
function test_allExpanding() {
var test_layoutStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Layouts 1.0; \
RowLayout { \
id: row; \
@@ -136,7 +136,7 @@ Item {
function test_initialNestedLayouts() {
var test_layoutStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Layouts 1.0; \
ColumnLayout { \
id : col; \
@@ -174,7 +174,7 @@ Item {
function test_implicitSize() {
var test_layoutStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Layouts 1.0; \
RowLayout { \
id: row; \
@@ -207,7 +207,7 @@ Item {
function test_countGeometryChanges() {
var test_layoutStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Layouts 1.0; \
ColumnLayout { \
id : col; \
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 16ebf6c20..7184ddb53 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
@@ -92,7 +92,7 @@ TestCase {
function test_clickToCenter() {
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
import QtQuick.Controls.Styles 1.1; \
ScrollView { \
@@ -146,7 +146,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml
index 106f9520b..5880e2102 100644
--- a/tests/auto/controls/data/tst_shortcuts.qml
+++ b/tests/auto/controls/data/tst_shortcuts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 57d79414c..f91363643 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -169,7 +169,7 @@ Item {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
@@ -239,7 +239,7 @@ Item {
function test_updateValueWhileDragging() {
var controlString =
- 'import QtQuick 2.1 ; \
+ 'import QtQuick 2.2 ; \
import QtQuick.Controls 1.1 ; \
import QtQuick.Controls.Styles 1.1; \
Slider { \
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 4a01c6c27..40191db84 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
Item {
@@ -354,7 +354,7 @@ Item {
}
function test_get_active_focus_when_up_or_down_was_pressed(){
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Column { \
property alias spinbox: _spinbox; \
@@ -437,7 +437,7 @@ Item {
}
function test_activeFocusOnTab() {
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
@@ -589,7 +589,7 @@ Item {
function test_construction() {
// onValueChanged should not be emitted during construction.
var root = Qt.createQmlObject("
- import QtQuick 2.1
+ import QtQuick 2.2
import QtQuick.Controls 1.1
Item {
id: root
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index 6ba340272..b5311b038 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/auto/controls/data/tst_stack.qml b/tests/auto/controls/data/tst_stack.qml
index c06eda3f3..eb2b47d42 100644
--- a/tests/auto/controls/data/tst_stack.qml
+++ b/tests/auto/controls/data/tst_stack.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
TestCase {
@@ -49,17 +49,17 @@ TestCase {
height:400
function test_index() {
- var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property int index: Stack.index }', testCase, '');
+ var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property int index: Stack.index }', testCase, '');
compare(item.index, -1);
}
function test_status() {
- var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property int status: Stack.status }', testCase, '');
+ var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property int status: Stack.status }', testCase, '');
compare(item.status, 0); // Stack.Inactive
}
function test_view() {
- var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property StackView view: Stack.view }', testCase, '');
+ var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property StackView view: Stack.view }', testCase, '');
compare(item.view, null);
}
}
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index e70cf458e..5e13acddb 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Controls 1.1
diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml
index 65bd83b1e..23433db46 100644
--- a/tests/auto/controls/data/tst_statusbar.qml
+++ b/tests/auto/controls/data/tst_statusbar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -63,7 +63,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_styles.qml b/tests/auto/controls/data/tst_styles.qml
index c1af406dc..c86ba44ec 100644
--- a/tests/auto/controls/data/tst_styles.qml
+++ b/tests/auto/controls/data/tst_styles.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
Item {
@@ -55,112 +55,112 @@ Item {
function test_createButtonStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ButtonStyle {}}'
, container, '')
}
function test_createToolButtonStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
Rectangle { width: 50; height: 50; property Component style: ToolButtonStyle {}}'
, container, '')
}
function test_createCheckBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: CheckBoxStyle {}}'
, container, '')
}
function test_createComboBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ComboBoxStyle {}}'
, container, '')
}
function test_createRadioButtonStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: RadioButtonStyle {}}'
, container, '')
}
function test_createProgressBarStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ProgressBarStyle {}}'
, container, '')
}
function test_createSliderStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: SliderStyle {}}'
, container, '')
}
function test_createTextFieldStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: TextFieldStyle {}}'
, container, '')
}
function test_createSpinBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: SpinBoxStyle {}}'
, container, '')
}
function test_createToolBarStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ToolBarStyle {}}'
, container, '')
}
function test_createStatusBarStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: StatusBarStyle {}}'
, container, '')
}
function test_createTableViewStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: TableViewStyle {}}'
, container, '')
}
function test_createScrollViewStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ScrollViewStyle {}}'
, container, '')
}
function test_createGroupBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
Rectangle { width: 50; height: 50; property Component style: GroupBoxStyle {}}'
, container, '')
}
function test_createTabViewStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: TabViewStyle {}}'
, container, '')
}
function test_createTextAreaStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
+ 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: TextAreaStyle {}}'
, container, '')
}
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
index 27d669345..eb622abfd 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/controls/data/tst_switch.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -115,7 +115,7 @@ Item {
}
function test_exclusiveGroup() {
- var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n"
+ "Row { \n"
+ " property alias aSwitch1: aSwitch1 \n"
+ " property alias aSwitch2: aSwitch2 \n"
@@ -187,7 +187,7 @@ Item {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml
index cffe63b53..999f148a1 100644
--- a/tests/auto/controls/data/tst_tab.qml
+++ b/tests/auto/controls/data/tst_tab.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml
index 5dd46ae2c..73e1c8d2e 100644
--- a/tests/auto/controls/data/tst_tableview.qml
+++ b/tests/auto/controls/data/tst_tableview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
@@ -71,7 +71,7 @@ TestCase {
function test_basic_setup() {
var test_instanceStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
TableView { \
TableViewColumn { \
@@ -631,7 +631,7 @@ TestCase {
}
function test_columnWidth() {
- var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
+ var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, '');
compare(tableView.columnCount, 0)
var column = newColumn.createObject(testCase, {title: "title 1"});
verify(column.__view === null)
@@ -640,7 +640,7 @@ TestCase {
tableView.addColumn(column)
compare(column.__view, tableView)
compare(column.width, tableView.viewport.width)
- var tableView2 = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
+ var tableView2 = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, '');
ignoreWarning("TableView::insertColumn(): you cannot add a column to multiple views")
tableView2.addColumn(column) // should not work
compare(column.__view, tableView) //same as before
@@ -662,7 +662,7 @@ TestCase {
}
function test_addRemoveColumn() {
- var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
+ var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, '');
compare(tableView.columnCount, 0)
tableView.addColumn(newColumn.createObject(testCase, {title: "title 1"}))
compare(tableView.columnCount, 1)
@@ -740,7 +740,7 @@ TestCase {
}
function test_moveColumn(data) {
- var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
+ var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, '');
compare(tableView.columnCount, 0)
var titles = ["title 1", "title 2", "title 3"]
@@ -774,7 +774,7 @@ TestCase {
function test_positionViewAtRow() {
var test_instanceStr =
- 'import QtQuick 2.1; \
+ 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
TableView { \
TableViewColumn { \
diff --git a/tests/auto/controls/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml
index c471e40b2..a88b3c6ea 100644
--- a/tests/auto/controls/data/tst_tableviewcolumn.qml
+++ b/tests/auto/controls/data/tst_tableviewcolumn.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml
index 635680ac9..7c3b335f6 100644
--- a/tests/auto/controls/data/tst_tabview.qml
+++ b/tests/auto/controls/data/tst_tabview.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
Item {
@@ -59,7 +59,7 @@ TestCase {
}
function test_repeater() {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { } } }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { } } }', testCase, '');
compare(tabView.count, 3)
tabView.destroy()
}
@@ -70,7 +70,7 @@ TestCase {
}
function test_changeIndex() {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, '');
compare(tabView.count, 3)
verify(tabView.getTab(1).item == undefined)
tabView.currentIndex = 1
@@ -83,7 +83,7 @@ TestCase {
function test_addRemoveTab() {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { }', testCase, '');
compare(tabView.count, 0)
tabView.addTab("title 1", newTab)
compare(tabView.count, 1)
@@ -161,7 +161,7 @@ TestCase {
}
function test_moveTab(data) {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { }', testCase, '');
compare(tabView.count, 0)
var titles = ["title 1", "title 2", "title 3"]
@@ -193,7 +193,7 @@ TestCase {
function test_dynamicTabs() {
var test_tabView = ' \
- import QtQuick 2.1; \
+ import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
TabView { \
id: tabView; \
@@ -225,7 +225,7 @@ TestCase {
function test_dynamicModel() {
var test_tabView = ' \
- import QtQuick 2.1; \
+ import QtQuick 2.2; \
import QtQuick.Controls 1.0; \
TabView { \
id: tabView; \
@@ -246,7 +246,7 @@ TestCase {
}
function test_mousePressOnTabBar() {
- var test_tabView = 'import QtQuick 2.1; \
+ var test_tabView = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Column { \
property alias tabview: _tabview; \
diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml
index 31239befa..3eced48cd 100644
--- a/tests/auto/controls/data/tst_textarea.qml
+++ b/tests/auto/controls/data/tst_textarea.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
Item {
@@ -81,7 +81,7 @@ TestCase {
function test_activeFocusOnTab() {
// Set TextArea readonly so the tab/backtab can be tested toward the navigation
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index c8f59b7f4..e7bd7d81d 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
Item {
@@ -131,7 +131,7 @@ TestCase {
}
function test_validator() {
- var textfield = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
+ var textfield = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
textfield.text = "blu"
compare(textfield.acceptableInput, false)
@@ -292,7 +292,7 @@ TestCase {
function test_activeFocusOnTab() {
// Set TextField readonly so the tab/backtab can be tested toward the navigation
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index 60ca63138..a4d61415f 100644
--- a/tests/auto/controls/data/tst_toolbar.qml
+++ b/tests/auto/controls/data/tst_toolbar.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -63,7 +63,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 02ae5edef..9ffa17765 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtTest 1.0
import QtQuickControlsTests 1.0
@@ -76,7 +76,7 @@ TestCase {
if (!SystemInfo.tabAllWidgets)
skip("This function doesn't support NOT iterating all.")
- var test_control = 'import QtQuick 2.1; \
+ var test_control = 'import QtQuick 2.2; \
import QtQuick.Controls 1.1; \
Item { \
width: 200; \
diff --git a/tests/manual/ApplicationWindow/main.qml b/tests/manual/ApplicationWindow/main.qml
index a9a64ac54..c4330da3f 100644
--- a/tests/manual/ApplicationWindow/main.qml
+++ b/tests/manual/ApplicationWindow/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml
index 1d68068f1..28e4b06f1 100644
--- a/tests/manual/ContextMenu.qml
+++ b/tests/manual/ContextMenu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml
index 78c783ea6..91cdba409 100644
--- a/tests/manual/Layout.qml
+++ b/tests/manual/Layout.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/manual/StackView.qml b/tests/manual/StackView.qml
index 8769e9a60..5c22072b5 100644
--- a/tests/manual/StackView.qml
+++ b/tests/manual/StackView.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml
index 7e6ef0f56..8b05721d5 100644
--- a/tests/manual/WindowContextMenu.qml
+++ b/tests/manual/WindowContextMenu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Window 2.1
diff --git a/tests/manual/baselines/main.qml b/tests/manual/baselines/main.qml
index d71930b4b..6edfdd683 100644
--- a/tests/manual/baselines/main.qml
+++ b/tests/manual/baselines/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
diff --git a/tests/manual/combobox/main.qml b/tests/manual/combobox/main.qml
index f0d1ab2de..55441c9a3 100644
--- a/tests/manual/combobox/main.qml
+++ b/tests/manual/combobox/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/manual/keynavigation.qml b/tests/manual/keynavigation.qml
index 55ddb4786..66fd4875d 100644
--- a/tests/manual/keynavigation.qml
+++ b/tests/manual/keynavigation.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 0.1
ApplicationWindow {
diff --git a/tests/manual/popupwindowkeyevents.qml b/tests/manual/popupwindowkeyevents.qml
index 696d48d59..8b521c961 100644
--- a/tests/manual/popupwindowkeyevents.qml
+++ b/tests/manual/popupwindowkeyevents.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml
index 69baf8ba3..7c8b88916 100644
--- a/tests/manual/scrollview/main.qml
+++ b/tests/manual/scrollview/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml
index 768a9607e..aefcbc280 100644
--- a/tests/manual/splitter.qml
+++ b/tests/manual/splitter.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
ApplicationWindow {
diff --git a/tests/manual/stackview/ButtonMenu.qml b/tests/manual/stackview/ButtonMenu.qml
index 355c76db6..684e026af 100644
--- a/tests/manual/stackview/ButtonMenu.qml
+++ b/tests/manual/stackview/ButtonMenu.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/manual/stackview/View.qml b/tests/manual/stackview/View.qml
index ec844c907..f5872a473 100644
--- a/tests/manual/stackview/View.qml
+++ b/tests/manual/stackview/View.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/manual/stackview/main.qml b/tests/manual/stackview/main.qml
index caf30f80c..f93bd7fa3 100644
--- a/tests/manual/stackview/main.qml
+++ b/tests/manual/stackview/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml
index 29ee0599a..c8c5b73a5 100644
--- a/tests/manual/stretching.qml
+++ b/tests/manual/stretching.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml
index b21162f3c..d06e87801 100644
--- a/tests/manual/stretchingcustom.qml
+++ b/tests/manual/stretchingcustom.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml
index d8130a5cf..9bc0a0b92 100644
--- a/tests/manual/tableviewmodels/qml/main.qml
+++ b/tests/manual/tableviewmodels/qml/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
Rectangle {
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index a7cb51bc8..60b2cec06 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml
index 2f7718aff..31cb5d77f 100644
--- a/tests/manual/testbench/content/PropertyLayouts.qml
+++ b/tests/manual/testbench/content/PropertyLayouts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index 929b19376..87f7a71be 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -263,7 +263,7 @@ ApplicationWindow {
case "horizontalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft});
enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight});
@@ -272,7 +272,7 @@ ApplicationWindow {
case "textFormat":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText});
enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText});
@@ -281,7 +281,7 @@ ApplicationWindow {
case "verticalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop});
enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom});
@@ -290,7 +290,7 @@ ApplicationWindow {
case "textFormat":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText});
enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText});
@@ -299,7 +299,7 @@ ApplicationWindow {
case "inputMethodHints":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone});
enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText});
@@ -322,7 +322,7 @@ ApplicationWindow {
case "orientation":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal});
enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical});
@@ -330,7 +330,7 @@ ApplicationWindow {
case "echoMode":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal});
enumModelData.append({ text: "TextInput.Password", value: TextInput.Password});
@@ -342,7 +342,7 @@ ApplicationWindow {
case "textColor":
isColor = true
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Amber", value: "#FF7E00"});
enumModelData.append({ text: "Azure", value: "#007FFF"});
@@ -351,7 +351,7 @@ ApplicationWindow {
case "sortIndicatorOrder":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.AscendingOrder", value: Qt.AscendingOrder});
enumModelData.append({ text: "Qt.DescendingOrder", value: Qt.DescendingOrder});
@@ -359,7 +359,7 @@ ApplicationWindow {
case "checkedState":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Checked", value: Qt.Checked});
enumModelData.append({ text: "Qt.Unchecked", value: Qt.Unchecked});
--
GitLab