diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index 18883d9a9fd9a6aa4e80e38b96fff4afa4505e4a..ecbbb75a186e28a3e4e3669c34ff37bb9fd58de5 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 a645e4766d4a9f0beca9d2e1a46240aecc5b3c66..08925f6323ab9fbd86c9d5340c7f509135c8a47e 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 6817d9b7248396274cbf16971062e81ca7436d10..b7e461881cb65da55b72f48ebce4b2422a8be10f 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 0b045bf6ab7322fb15bf9790b0fe91729c232a4a..01f24ab331449d39bfb3b2c38a30ee0abb02ec48 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 db9ae0f0893d02644fe67edd46bb8b1becc83625..0cb234c39356e65ddd9bd178fc695db711404e31 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 5bbb34f4f3c2a148ad6e691ac3eb9cdbac6400e7..be334458d8536f17cd5c8654cc02edf0c205a1f0 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 81b46f636864bce6e259216e6b2c6284f814c520..ed237d82b8baa5d78cb7d9c7a6ad972e1a3cef05 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 395188ce71a4c9f62476b0ed8af6657f292ccf04..d93c74d3d1af2f0f04fb39d40c66c752ffaec626 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 d15b6f65bb25c702d65548f52a2e95c4c50271d0..553187b622543caa63d2c7545af74318295a9b56 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 40a2bc580b079b51a6a80b0e929036d00b759d41..b69849762c585ee2c005b19007f09fd908f65395 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 36a439a8e0ea20756630d1bd922ebc16bd3f73ea..21ee8e680b9b2d2d59fc56f63a80d062cadc621b 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 90a8a69c56f6dad44b134f8003be2fef935e07bd..4cfb569487ab218363960fb08fd3d95f8d31edd7 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 1edd17d05e141bec85e413c38cd9dc7dd06ceff0..65dc99f51c6c0259e8e9d7deef9cf08afdae3b4f 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 53882897f80bf5ea721e1a3cff6c9765a0f18d41..019d7206184700f22916a9a0198cb030d62f1176 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 719adf44087010dd1c04ce782ad91303a1b16882..91f1504d8b784d47986fa74a9544ff547cb6f32a 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 7070af47fcfbf18f567a5d20edf23e09daeff416..c9bebccd32ae044918446f76fe12ce34f0cb94f1 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 ba9aa1d6f29aca26460d71dbd90ff62460f0cfe7..0eeea03a2fb6f6ff1ae771b607375266766d4d71 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 163ec937244e672a4e96f197df63d923fbbc47d5..c794f7dcc8a1faa54f8b2032779e7a736f61dd99 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 08c3ffe97786d7eea788cd6c8b740c1a020f2464..3b0c84c6afbfef23b82b61c1c73009f2a691d556 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 389979ef536ac24e4c3583dce5c60ae9a85e249b..81c06b7e657c1d4f26273d75e84a2969f9eb414f 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 ccfff2d6b4594d97c1329eaad23c777592717432..05e3b5b072e4a418b8c5d41b11824c354ccc3ac0 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 6be997420f5466fc8563b56f4a65e02112545d2e..619a0b80135c75701db704fe98c062932ad85298 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 ec40d4febd0cf9777345ab9369be30aaa25e5200..728342877cfe62b4910d69cb1216b1e10b9dc37f 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 01820bb82008d5d1de5cb6e6e9d8884eba7d2b5b..25eb6dc508054ebcd4156f63ed66432979a8835a 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 1875e423a69d16539748a33d6f1fc84d79d92330..afd7f381881d60c9af0f03043a0ed607593ebdb8 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 e96e64fd6daf0f2612c35f8baf2559a31ab456ac..7249bd001fcd760b160914424b62debc5aadc69a 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 5ce5bf071f45c84505cf2deb34101111ed9d2153..20c4e1e560de84397a61538c59d94b1acca2f3ee 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 12959d16ff353f42ad6491f549bcf905fc1b1e55..5b3d31f64eb07f2b4f8e5139ab04b3224d5ed6d6 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 658772a830f86ae2616d31dc459e6d891f479656..7ec47490257a1ce74ad69ab67661605fc111f102 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 d7aa4a0a1b628835039dfaa76ab62af6aaeaf725..4794c17fadfbf9a304b407b2b650faf6a066f52f 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 f294d54eb1e80babbb3724ca5c9b8e4688057872..10f4ac2546fe1270823c1f3e4942551e67da8013 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 1d69d8696c4fa17a61d597c472b70d8ab86e64e0..4a9547a75656816e5dbcda5253608a67247f089e 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 44ec21109c7004b98df483aa66f30f34ccb2a90f..8bbc0b7e93f751a015acd5f4bfa8d72dc74e299f 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 40fc907b67699ca62e7890fe8ddca9ab0ddfab12..754ff141a1e626646754f2c08275ff1392aa5ef7 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 edfd309d296d848cff120353dc8834839a63223e..1e386424ab2a15060b410e0f33ae07ad962150b9 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 0ce8908fb05f41e68b2951d689e94be0e1feb617..a520e37273e7d16cfc96d80bf38afe05abd81da3 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 f4bd2c742193985ff87cdb03bb67f67742e144e5..5b3b4881475cbbc8416c6e15504f6afeddef74f0 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 449d06b1a684370c8c0822a42529060c52efa6a1..1ad0af0298b225a3284a883ef254f09dbd102d9c 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 f55077a0ea1007bb919bd071993e8dd873ad541d..678426d54c79343ff3f458749671ebce800c6671 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 e18132bb0312acb704ca291292b41deae4d2c51e..0530cf6a4d6be76d7b7b956b95660cc5668e8957 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 af62bf5be63880f49b812a1193a2f927e3a690fc..d5487bd728b04bafb0f6adf68ab5dd7547e0e1e9 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 8b78cb31b393848eb726dcf5e4f3f185bad65f69..bd1535d4fe72bbf4b8265ee7fceb7b4c1303caf9 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 1734e4961c7b079e072d33b1fe695ac78479e7b8..0bebd1ebaf6eb965107d631c12ad1bc200d2a88c 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 3f1166f3e87d550e3434e505c0267612ad5ab318..a54559386f6af984a2351623f973d0a5e017a536 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 1cf03f313e0b66d40f78c6d641a741ca3dcbf012..0b91d317026a3c99a2c6a06bb895904df68163b1 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 88530e696c2f5e0e52e6b12f937a360c1f22c6d3..df5b60d2f435b7faaf7c0f865c7c9a8d4599c827 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 ed31536dd7faaa85fda50a19f6d271425324963f..5d2822b93e9183938807b4491b0f02ae528e894b 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 6dc98d1a91b1d6e1f4a5211f392183bb32072425..2af7d23ce9567ec45def4aebbb25f52c302e22dc 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 5ed5b0d4d29997d1bb38864fca929b6743b840a8..e15a9ab86b83ef938a3fab085a0664247417b5b0 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 7a3f07cdd157d63d30044bbcddd5971d9a22909a..c32c89f216c389e46620210925fbbd7803b037d5 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 523f3978e0b7501f59df712ec084aaccaa304776..01deac63ea549854129f5621b968b15965bc6704 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 2947093d2d7e6cc9496d0d4b19e157ed02441efa..420ef2be7d9c7281707d7874d458e70981346a93 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 af6a077e01e4a5155db9c6ecb12722a94feecab5..c72277d8fa47df238357504e1b6e1b9b2978f955 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 c2869563a84fc35942b59147a2eb3c234341c88f..3dd70475d298b5b1e70d427bcef41153132e78d6 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 b079bc5031c3757ba1acf472a028742e0da66451..5318105c7ea8b623cc502726ef50facd5396f3ce 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 11e2d1825002b1a80cc89c343b185c4ff93a5c2f..e19189d0da8d37d6817d2a2fd0abd162e02d3ec6 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 40f9437c87b52d2112830dcd7c07040369a0fc1a..95c42f7a408b920de47cc4895049207b6ee938d7 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 e58ad3f34e77aba35b2ce16e9ef16175127c97ef..1c5895c51ecef3c2d7b6e93a20dc6cc41cb380fb 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 5993ce464a3359fbd1bf74dcce19b3f19b21f123..af5870b032a32e77b2d10626b8efaa14218c8206 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 92ee6395b920d5d6dba41fd739d23b2cbe3f3682..1ab680d7c2c291e625c947e1881dc59de3316949 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 c61746f51b0c12ecde6d147c7ab8ef27c2aec422..f7e9bc7e93cef35d3fb15020bc85204904262140 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 55e604252ca4fee519c158e044b4966424b4deda..9a0c80a62459f75f89e098b4bafdd2e434ddb20d 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 27edf11c5c561409808b0ffe1dd3812d807f14f8..d935251b0a15c05a51b2a00fe1781b2b42dc93d8 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 c0c08d562305f9c260ec8e3ed635cfd7c445871a..45cce7c9ecf07b61af2af66cb4011ab387ad8407 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 396f3541967ed7a596e985e736d58ffbe862cd36..da8e1f97dd86d11739a3cb75c08b05ecd991e3ab 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 67aed5e5ddb4996c010c4df1376cff99f845dd71..d1391ea1a0e0af6c6e3fea74fa8e4787885319fc 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 d0fa9a355af78850efb2b6166ba8bc89baa79493..de05faa5d34ab72002737675b678b1fe9d29256f 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 74fc0558d2b0bad7c09427ea80e3f2944b809321..c697decc7c3cb59ca03c3cda2f2dcd7a7f8aa208 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 1944ed43d411f18c8faf1c78cdecd3fff1a4d4c7..8e3e5efcb227ab0f22104e575161219a9347d2c3 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 a62230bcf5231206cdc08d9fabc7b332255a299d..11f3e15a5a362dbfb3aea3041b87048f97de8912 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 183b36b8b714f6de548f10b62df55c50bbdf590d..1d889b908178b2424f39dcd4c39fc78b7a3e42d2 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 aa8f6d6e9f6613cabf918681f491a658b52d75dc..8e750519858e6679a7b8061570fe9332aca57e1f 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 448a2feb56c48e215d470c65af759e9457421fbb..758b6be6cdb0ed01c28587b8d4c95ba54026647f 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 bf8af48a38694e228d343c5c5729cbfad86f12a8..31ea5073dbbd05747ef7d1230115ed3dc5ccabac 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 c974c01dac767c101c9be0b18aeb4ff3975f643e..91fc9489772671654b04513084c061b3c0b22d2c 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 1b732cee7215ed3df8dc9f6c7303fb91738944ea..3e371c8d401ee99f54d9f75b95dfc274653f5771 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 ca5d93fbae034cfb6b41b9b7da380f892947142c..82ad4f1f7c9fc62f82c20e71e246829c76dba22d 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 dcdfe4dee8a19f1c2bb0fc87da4f078e7770dde6..9e4f3ccc88c9cf58563db06deff8d8de8536e338 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 33e8f0eeda3b4c95af1eff47d7ef7b3006486777..07e1031b972f6ae11e3046a7156ba4ff4ce042d3 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 819c6a8198877e6580591a5db7491da47413431e..003d964aaf7fd2d8202b6514c2e2aed645cd81bc 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 12376ff7d7862de417ad06155e7735a02525bb52..b01940d111e9eacaa6f645af09720c5b455b8271 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 0bea860eee415e728775526401b79ea105667f5f..e52235edb262fdb7c09808e54cdec4cfb68dbcea 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 cfe02d3f1780cabbd11c3996798f1bcb366c837e..75c9de8fd87f493aa891c15123054c052a001bd0 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 6135bbdb11e045bb2a1a3b9fd456cb90d6ef352a..6218ce9bfdb6340372ea0de0856a97e6bf9e04ae 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 6cf67b1c75ed65b5d25b2510f795fb225434fa5c..90ffa76d35cdba61d33babd3c41beb82205bd99a 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 70fa04024767ffbb8393457003b89bc3044d2f61..633002a891d8b6328ea812435fea5b43d1655f6b 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 4a00ee22a6d62f044fbf95fa93470e301e347ddd..55d3b60e606e70828b4f3a360eaf6c67da4e5858 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 22c284416438c53fad8c05fc038e2cdad796a82a..8fd559f4c288306164e4f6050e5fbc83911a7c43 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 022570b256af455ce2a28783358d9ce124d3ce52..d11baad56656938fa9f783b626cddf3d6094d934 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 18bfec36f1e1f5d4de7419ba5d6b03109cf3181b..56f1f62e6447633312bfa45467c1b60ac526aa2c 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 1a1c687ea469f40182c1918e3247a16851c4d7c2..0c4ba0209dbf1dbebd1b22829a2e9bd9299cdb29 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 df9dd5bf96362ef05675d12bf27b94a4b7e2c677..54ce055387b252a077c1d8bbb93333cc60d9db10 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 f20c32cd70eb0eb38bc06f4406083e23824bc384..bde5e3f4996bfc3b1b1348498bbf0dc5e2ca0319 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 b9891b317e6eef6de100610e7f5c727602b88c6f..814618de6ad3ccbb3ef128d37b4ea066ac6ae4dc 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 dbcd4dce373729b2953d550186eed131c972e3ce..201dafa94fd1a8960559324a36021eb4dec36c16 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 0ca0d743d605b0742e803206aa5d4b0a18673f63..77de5e5ab4aa04061d8fd3d5af7fe8b0d1ddce6a 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 4f4b451e10f8a0b1af40980de38998a095fec6ed..eac5405ffb15f340f920205472e59a72cbbe6207 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 d690a5775e665c925ccd343153fabe9f9efbc310..cc5736b12b2edc852cd0d50a13831219225b7332 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 668ee22f4c870aea7cb1bf22aa94e939e537a6a2..f81991afad2e9860a28bc4339a57dc59f52d4502 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 cfd757c9726608a9a592dd631b536e53eb55d1fc..8957806a679520464bda52b15f8b01295957be66 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 fb31ca670bd13c94cc2545f9fe9aab143b5289c4..b185c24c4427580c03d736a8b833aa1190ceba3d 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 8006c443d3a36d09af7730ac02217a66a5f71a8a..a3da455e9a46622ea896b138e7d38522dc136a04 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 3336470e3fd058ba214f5fffbfcb62125823edf6..32068f2260436cdc17b7913c342525a142c3e870 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 7217caa2146f1d39ee778ecd0a1df2792655aafc..49393d3f8a426049c52c97e6e78107f814263891 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 caf1d46fd548a1c60e499a9b5a8fe2b9dbcafd26..e3d5d3ea97eaec0213ca38997fdfe32057213579 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 24ca162c31a9d2d717ae9d38c90e5c1386542fca..f1dec7202b32d6d5fcedce80efb44e210b864dfe 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 1b5f74858a36bcf4b931a5574f22f6c0664f9a32..14e1323e934eea6587b9ba9afded37523091654b 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 2cf157ab8ea49dccd34414d37bce14621e5ede21..0677714162b13edddb473794481ebedaf227d507 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 aa9efddfce95c56409168764f4b180ad998e901e..767939b3677e5e84dce3e52e5260cfbbae33fe95 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 881bf664b21684448485a2aca11ea7bdc6724d7f..2518ce95d04adb6d7cb4e900cdd54bdfa65e242e 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 0b46f9f3ae244ab425c8709014a944f9aafe3802..932dbfe3500c1887a510ee1497e6754a3696816e 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 ed7c7ab77af28d1c1d3d9d0538aeadaa6d02da67..c22cb5581d888c6ac93a762fae9401e35cd22c32 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 c8f59d20a7946ee1c6c214aad06f668cb7daa801..228f84e86cc6a00335de586772218042553add5b 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 8bc3eccfd71e69c10c771deca931fafbe16ee342..88a40d594c168836b756e56aae4c44bd369ea31e 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 8fc97173806c811ae4f89c7c0d11009fc9040fd4..219da0cb339d637b05a9130200641d1fa9b3b64a 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 ec930101d2a9b245a2202fafaeb646091e639494..64eb4387ee42f1a6d1f2f22235ffdea608f3941c 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 9e4083c8c3eb414c371b84e54e6f99163d257252..01430a5037633c18e7f88d1a728e86804af124fc 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 99bfc3924b7ee9f4e4acf3fe129237be8839ce02..5a969adb0ed00e8d80880dcd169c717ee5e7620f 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 d9411c334f8ccfd75b0429b10d4f8973dc54ab0f..5daf8a08ef06298d776879ba2f4511d117e00c29 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 42f785ce4c018d4d1f6647067338bc73a0c42d10..a434beb2c62b5ac2765fe4978921c11fc2135a41 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 d4e813019865e9b9992942d24abca1fa9b4d9bd8..c369619e3302e94d72a19085261863edf621bb0b 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 71bf9983f3cd2ab1133172dfab83d3e4dc11db94..194411dbfc0ce4f89fa264d906d9f4b9ba79e800 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 e3d69aa33c7b24494f5698a67a7cab53f306b856..af7845190749b470bf329b8faeebb40422592c2e 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 74f5a23bd60b5b451004e87b9301e2d525fa5d1f..1c285de1c691a34d9c25cde50ddab75acb5d0f43 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 daf111035a5c78f55bac5e2d93cb1d8aeb6b1e7b..c0dd6cbcd07c72417908d6b7204d7c53fff8c3fd 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 1244b40524aeefe016c48f926b451a2d1c421d75..1c8b06b24741579dfbd705f5beaf966f40373c29 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 eda5ee7212519c9277c93fc4aa9c2c9dab686a5d..5f343ff970c3ef592f336d4e4f0b3c964abeb9d7 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 1cfcc2a6a01fa1f73daf2e3b98be0a4f8e9c7e38..9cd36cbb4849445278136d091999d85a641b3d4f 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 0d3284d44e72d8fc9a96b580da979050f05254fb..61416ea1e50ff7c2632377b9a761131c0d35cc91 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 61ed542e8a9596dcee7007ba59af6697c0a38ba3..b7ac4ca7bb167fcc99acc7ea12849a53b4b73906 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 05d5743515ebdba21276a34c3c1a267c42df2679..cd2d26b077b73fd719707608c8b02e3b5f7d9d4c 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 079f32134461b9902767a029e3a60dfd0b7204bb..00dd99c01a411688d0d1eb9410f5665ee7388de3 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 9022d8ff45153bd78f0544437ce8140be93523e0..23c523faa6b5b3e4f0219615351649f7414ce739 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 3b458837d85bb5ce7e51d68de8740936dbbc6ff0..b4cd13aa289e53322fe1e701fae3ee84f8974901 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 d0dc0079f257492ec17f22355816c074879670be..28b1198cf932a4203ed7b2cf222cc0665d1b2688 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 f683aeac06b78342d18c2248ec324ebee000e71a..93536bfe14fe7475101fc2f5a6af8a900616ccb9 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 c9ad3d5eeb899041761b3f0c7b14e84778f683f0..b55a4c6c21348cab850df2afd7f8ebdff9f50c51 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 e8922dd935984e595e72293f1bd03e8726499fc7..7d055df3cd5feed4863e64e4b6e0d0c089394e32 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 421a1ce97ffbcb08f7f8020683f457f9e0d07bf6..7709aea8832b60d30dfaa7ef2a4434e7d094156b 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 f63149ab57a0a6fbb62328ee16b4a7afc6c8009a..e5fd598e57479f106abe53eed9c69cfb328bec16 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 58af9df6ac24802a9b9c898cae249afecdf6ecae..cb81523d09ccc481b679ee02b7ae95a8072a7e33 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 95825d725d4dcfd9a420fc012365420ca1eabe05..8642701301b18ae41cb15a558518b98f558180e2 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 6b9760d04de3276aad717d5a8f0917f4d9589c24..788b272f208a4672bb408af9aa6978e634693344 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 4f543fc1f3fa0bbf6966212c674bb76c45c25438..42a51d57bbce4aa022640e50e63b1930f98555b8 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 5b68153e3fb3976d16fde26005a84f3a6bbc58f4..ae454a736849968e141d438cee7f32768d7b8d58 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 7450c705e48e25a086eb9defde3fd6497e9b3901..47e1c21869883a90ae88c1f51a71236691359d22 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 912ed7faf72eddbfebba6d0be7fbc82f2f2cc657..c949788b54bd6d71fd63457ea6a44ad79f15c6d0 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 ee555ac01d23c6c8bcf5e26bf39d3130d6101249..ad06045e4642f9319143e477011e105c81458730 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 278fb0e1525564ed0bec2bc799eb504b78801c65..dc52238be3b77a6080509a5a0ba26176a4cfb641 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 4d5117fbd81c7b9aee0e851b910cf5a916a1709c..721284cf9387002678f242fecc966268a5b28e85 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 7ca13b6b07ca54a2160252a8ed6779c79623e346..a595cca17c4e3fb335578271e6cd2ce6ed97512a 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 d5986eb76154a4ade6561842305be5b1d46a85cf..977527efa491ee706077c9b0d2873bb52b8251f1 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 c6d200490abe465b746b0199dd10f1ba56ed3743..4a6e296c427420c26b8e5233b9fc3ac4d0e2cb4e 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 8ce582dbc0d635a4092c675e84d7b6a0ae7bbd07..eac909425fa3c086776058f7f81af19cbd6b8151 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 d915808069d18c52f34cb2df890d1cf82317d2df..c53ae22c04917c869c58dc4720de4f5f4893cb84 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 8f46108cdac991e39d74dbedd5234b813752dcc9..4c2c25cf03215638fb98eae1589f2e42297a4435 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 b6b494fefb3c333139911218ff19a46a75a325da..9f22300a3b5f36a06bd8bd7d82a1a9e12c7dafdf 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 c8f7591272ca435f338f467f7346d973fd829eac..6a6efcd497b26b4f680b6029d88e2c19cae0db01 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 2ba04926310a5980a031c0ecd2747f3fcfbba5d3..bbb0e3bfbbf1e32994f4e6dda8ee7fbc2c9f7bbc 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 9db6c803e9f446322aa4c647b4c3666d9689478d..7daee7e8a53d185c297961fde7b53a4a97f93d32 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 16ebf6c20a71939fa4d8d4a5ca209fbf466f4f51..7184ddb53fab22cecab17b71338a966954cb9bc1 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 106f9520b1f15fb027e3653ccb731ff22e7885ca..5880e210228d91f142d6cad84766c815dd310fa4 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 57d79414cdae041548b26c50edf3f6026e79002c..f913636437ceeb94f1ad6d3e6f6cc5cd1dbd9118 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 4a01c6c273a9558b4bc7f9c93479b7ea8d7bfa12..40191db8469998fb4bd7787891879dab10a96fe2 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 6ba340272d227d85d3cdfdcd6951c4d756232356..b5311b038beeda2d39ca61b4ff604bbfd7b2fbf6 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 c06eda3f35047b0e46003556de6bd14cb1f2fe88..eb2b47d42639db618377a0b1d791ba8aedcb6391 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 e70cf458e475e49197f71072bc3d60e34ec7f4e3..5e13acddb175709118a28ecf3cbf155d280a890d 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 65bd83b1edfc3d02893d2d857b44684f79c45baf..23433db460cbda90a8151bf638152ca075c96e71 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 c1af406dcb3825739711c810915d586883b2d955..c86ba44ec7acbfbe08bccbb1b972fbcfee835be6 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 27d669345e7ee3b09bb8e71198d2b234fd06858c..eb622abfdf50e45ad4b1fc9ee80ebef16d875c63 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 cffe63b53e08fdad78c8af7b6aae8caa2ec9fd5a..999f148a19cf84cfb8c1cfe66ae70ac6630047d7 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 5dd46ae2cd1d432b97e772de31a749f1dec736b4..73e1c8d2ec29d3a00650e9e56acc446eda467688 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 c471e40b2859f1358e2817305afc4d9a212dc6d5..a88b3c6ea2a4eec81d342f984325c1a8fb3e210f 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 635680ac9ae10a23ba1028edfd5bebde04482b28..7c3b335f6eaeb89235f3262751a07687d84311e3 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 31239befada3c8b9195279364d99def821cdf832..3eced48cd2b1ed06edace9d676a79fdd93250d0e 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 c8f59b7f4c0c1dc576b4b6e33340ae0dd5f751e7..e7bd7d81de75f85777f7f61c619a189d931c5f56 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 60ca631385a38309c59e74ffc6700cdd5470eb1c..a4d61415f2bf46250e7020dc3501f2d98e59b0e5 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 02ae5edef7bef4eb382c2eb719d908e47e913355..9ffa17765658b5d318cde1f4fa724a9f6246b8d0 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 a9a64ac5427c41d65f4eb65133e6e460c2b4a3dd..c4330da3f0a04c2a4450428b566ebeff3340ba2f 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 1d68068f1053a934d3ddc7a8dcd858957f25acb0..28e4b06f10b22222eae02bfa77d936b650efe9bf 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 78c783ea6689c48c55347a4bfd337cc8ed18afa5..91cdba4092291d959a26257094157e2b03b1bca6 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 8769e9a6040ae31152087b6080e8986b4fc4ab09..5c22072b505a900652a72f1922113eda94a0d985 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 7e6ef0f56dc12c8b52213d4a9c20c6d6661c180b..8b05721d5748c9a684f0c056dd4c1e9b3cf2f1d3 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 d71930b4bc92c2f16194b1e95810b0b3a70cea96..6edfdd683458f15a025a9709fef4ae8705a7564e 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 f0d1ab2de6a61a7ea69589dd7276787d7fd0c725..55441c9a333790f26b503b68ae6ed6412d6f47b0 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 55ddb4786b18841e066ff05d40c77636de3ee1d5..66fd4875db6501e88f24e5ebd487effa48e74705 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 696d48d59f57b5fa644bcc769592561e2b3e04ed..8b521c9617eb0d97d0163b347d8051672263af91 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 69baf8ba399b19f966f211e5836e50ff84ec2dee..7c8b889169f230a4ec7096938f3f32fa553a62ee 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 768a9607e9bb98951347d3f4d08db0f5853ba31f..aefcbc280326a36e75f02dd5e9868f2ecc0aac68 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 355c76db6401fcf4dc1bab0681b0dc31555102da..684e026af78bedc8191c1eff38bdf11c0a1e20fe 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 ec844c9073b0888f5f629a93203559602a7abb6a..f5872a47327afa23ee14bfef76176d8e6ba1c143 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 caf30f80c6cdf6f9a485b6c1edfc79dc819d6b0c..f93bd7fa38f9069aa3b5ccf2182933002cb21b62 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 29ee0599af4cfeff8b31381523bd0f6f2320f819..c8c5b73a5d9b28fd4c4c3ec4fd3f118cefb0e5ae 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 b21162f3c8b305af4d2ca7955b982e4c86901f6d..d06e878017356bcf5e33ad24b45d9a1ab0c879c5 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 d8130a5cfa671a41739ee3123c63b3e3b6b89312..9bc0a0b92b5423b8615510f437c15b593629837b 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 a7cb51bc814090622874abcb9c40455755fc8505..60b2cec0676954fbd8f8497c4ba0edcf3984af8d 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 2f7718aff627aad74b3873bb6bd1bd16c2f57695..31cb5d77f18368e2757817088aa3398d45b564d0 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 929b19376c97f32753d0b5847b6a572845ff2084..87f7a71beac6537eb430f8dc49e2ffbda428f4c7 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});