diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-07 10:32:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 12:12:35 +0200 |
| commit | a3d87642cdebb32793258b6fe87c590ee5ceb3a5 (patch) | |
| tree | 7097f4db25db90cfcf51dd7176bfd6b6b343097e | |
| parent | 783da20117857dbc840b9863f2cb4227773b338c (diff) | |
| download | qtquickcontrols-a3d87642cdebb32793258b6fe87c590ee5ceb3a5.tar.gz | |
Import QtQuick 2.2
Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
198 files changed, 280 insertions, 280 deletions
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml index 18883d9a..ecbbb75a 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 a645e476..08925f63 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 6817d9b7..b7e46188 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 0b045bf6..01f24ab3 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 db9ae0f0..0cb234c3 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 5bbb34f4..be334458 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 81b46f63..ed237d82 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 395188ce..d93c74d3 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 d15b6f65..553187b6 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 40a2bc58..b6984976 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 36a439a8..21ee8e68 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 90a8a69c..4cfb5694 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 1edd17d0..65dc99f5 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 53882897..019d7206 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 719adf44..91f1504d 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 7070af47..c9bebccd 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 ba9aa1d6..0eeea03a 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 163ec937..c794f7dc 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 08c3ffe9..3b0c84c6 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 389979ef..81c06b7e 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 ccfff2d6..05e3b5b0 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 6be99742..619a0b80 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 ec40d4fe..72834287 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 01820bb8..25eb6dc5 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 1875e423..afd7f381 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 e96e64fd..7249bd00 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 5ce5bf07..20c4e1e5 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 12959d16..5b3d31f6 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 658772a8..7ec47490 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 d7aa4a0a..4794c17f 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 f294d54e..10f4ac25 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 1d69d869..4a9547a7 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 44ec2110..8bbc0b7e 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 40fc907b..754ff141 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 edfd309d..1e386424 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 0ce8908f..a520e372 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 f4bd2c74..5b3b4881 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 449d06b1..1ad0af02 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 f55077a0..678426d5 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 e18132bb..0530cf6a 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 af62bf5b..d5487bd7 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 8b78cb31..bd1535d4 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 1734e496..0bebd1eb 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 3f1166f3..a5455938 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 1cf03f31..0b91d317 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 88530e69..df5b60d2 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 ed31536d..5d2822b9 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 6dc98d1a..2af7d23c 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 5ed5b0d4..e15a9ab8 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 7a3f07cd..c32c89f2 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 523f3978..01deac63 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 2947093d..420ef2be 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 af6a077e..c72277d8 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 c2869563..3dd70475 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 b079bc50..5318105c 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 11e2d182..e19189d0 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 40f9437c..95c42f7a 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 e58ad3f3..1c5895c5 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 5993ce46..af5870b0 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 92ee6395..1ab680d7 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 c61746f5..f7e9bc7e 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 55e60425..9a0c80a6 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 27edf11c..d935251b 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 c0c08d56..45cce7c9 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 396f3541..da8e1f97 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 67aed5e5..d1391ea1 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 d0fa9a35..de05faa5 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 74fc0558..c697decc 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 1944ed43..8e3e5efc 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 a62230bc..11f3e15a 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 183b36b8..1d889b90 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 aa8f6d6e..8e750519 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 448a2feb..758b6be6 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 bf8af48a..31ea5073 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 c974c01d..91fc9489 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 1b732cee..3e371c8d 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 ca5d93fb..82ad4f1f 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 dcdfe4de..9e4f3ccc 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 33e8f0ee..07e1031b 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 819c6a81..003d964a 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 12376ff7..b01940d1 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 0bea860e..e52235ed 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 cfe02d3f..75c9de8f 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 6135bbdb..6218ce9b 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 6cf67b1c..90ffa76d 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 70fa0402..633002a8 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 4a00ee22..55d3b60e 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 22c28441..8fd559f4 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 022570b2..d11baad5 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 18bfec36..56f1f62e 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 1a1c687e..0c4ba020 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 df9dd5bf..54ce0553 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 f20c32cd..bde5e3f4 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 b9891b31..814618de 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 dbcd4dce..201dafa9 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 0ca0d743..77de5e5a 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 4f4b451e..eac5405f 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 d690a577..cc5736b1 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 668ee22f..f81991af 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 cfd757c9..8957806a 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 fb31ca67..b185c24c 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 8006c443..a3da455e 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 3336470e..32068f22 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 7217caa2..49393d3f 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 caf1d46f..e3d5d3ea 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 24ca162c..f1dec720 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 1b5f7485..14e1323e 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 2cf157ab..06777141 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 aa9efddf..767939b3 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 881bf664..2518ce95 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 0b46f9f3..932dbfe3 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 ed7c7ab7..c22cb558 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 c8f59d20..228f84e8 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 8bc3eccf..88a40d59 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 8fc97173..219da0cb 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 ec930101..64eb4387 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 9e4083c8..01430a50 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 99bfc392..5a969adb 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 d9411c33..5daf8a08 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 42f785ce..a434beb2 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 d4e81301..c369619e 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 71bf9983..194411db 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 e3d69aa3..af784519 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 74f5a23b..1c285de1 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 daf11103..c0dd6cbc 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 1244b405..1c8b06b2 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 eda5ee72..5f343ff9 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 1cfcc2a6..9cd36cbb 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 0d3284d4..61416ea1 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 61ed542e..b7ac4ca7 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 05d57435..cd2d26b0 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 079f3213..00dd99c0 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 9022d8ff..23c523fa 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 3b458837..b4cd13aa 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 d0dc0079..28b1198c 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 f683aeac..93536bfe 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 c9ad3d5e..b55a4c6c 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 e8922dd9..7d055df3 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 421a1ce9..7709aea8 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 f63149ab..e5fd598e 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 58af9df6..cb81523d 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 95825d72..86427013 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 6b9760d0..788b272f 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 4f543fc1..42a51d57 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 5b68153e..ae454a73 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 7450c705..47e1c218 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 912ed7fa..c949788b 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 ee555ac0..ad06045e 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 278fb0e1..dc52238b 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 4d5117fb..721284cf 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 7ca13b6b..a595cca1 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 d5986eb7..977527ef 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 c6d20049..4a6e296c 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 8ce582db..eac90942 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 d9158080..c53ae22c 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 8f46108c..4c2c25cf 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 b6b494fe..9f22300a 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 c8f75912..6a6efcd4 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 2ba04926..bbb0e3bf 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 9db6c803..7daee7e8 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 16ebf6c2..7184ddb5 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 106f9520..5880e210 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 57d79414..f9136364 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 4a01c6c2..40191db8 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 6ba34027..b5311b03 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 c06eda3f..eb2b47d4 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 e70cf458..5e13acdd 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 65bd83b1..23433db4 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 c1af406d..c86ba44e 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 27d66934..eb622abf 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 cffe63b5..999f148a 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 5dd46ae2..73e1c8d2 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 c471e40b..a88b3c6e 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 635680ac..7c3b335f 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 31239bef..3eced48c 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 c8f59b7f..e7bd7d81 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 60ca6313..a4d61415 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 02ae5ede..9ffa1776 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 a9a64ac5..c4330da3 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 1d68068f..28e4b06f 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 78c783ea..91cdba40 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 8769e9a6..5c22072b 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 7e6ef0f5..8b05721d 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 d71930b4..6edfdd68 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 f0d1ab2d..55441c9a 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 55ddb478..66fd4875 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 696d48d5..8b521c96 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 69baf8ba..7c8b8891 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 768a9607..aefcbc28 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 355c76db..684e026a 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 ec844c90..f5872a47 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 caf30f80..f93bd7fa 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 29ee0599..c8c5b73a 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 b21162f3..d06e8780 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 d8130a5c..9bc0a0b9 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 a7cb51bc..60b2cec0 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 2f7718af..31cb5d77 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 929b1937..87f7a71b 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}); |