diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-07 10:37:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 15:17:02 +0200 |
| commit | 953b8d7ed82f2701ba8f6f572e60468da544c5ec (patch) | |
| tree | a5f2d6b69c9f3ea65c427120f4f2c07d2d3db6e7 | |
| parent | 9b206d4b0836f0f89aa667b44c6ac0a963808366 (diff) | |
| download | qtquickcontrols-953b8d7ed82f2701ba8f6f572e60468da544c5ec.tar.gz | |
Bump QtQuick.Controls import version to 1.2
Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
185 files changed, 337 insertions, 337 deletions
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml index ecbbb75a..7e95b80b 100644 --- a/examples/quick/controls/basiclayouts/main.qml +++ b/examples/quick/controls/basiclayouts/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/examples/quick/controls/gallery/content/ChildWindow.qml b/examples/quick/controls/gallery/content/ChildWindow.qml index 08925f63..039e20dd 100644 --- a/examples/quick/controls/gallery/content/ChildWindow.qml +++ b/examples/quick/controls/gallery/content/ChildWindow.qml @@ -44,7 +44,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Window { id: window1 diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml index b7e46188..64df4ebd 100644 --- a/examples/quick/controls/gallery/content/Controls.qml +++ b/examples/quick/controls/gallery/content/Controls.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.1 diff --git a/examples/quick/controls/gallery/content/Layouts.qml b/examples/quick/controls/gallery/content/Layouts.qml index 0cb234c3..8d6b096e 100644 --- a/examples/quick/controls/gallery/content/Layouts.qml +++ b/examples/quick/controls/gallery/content/Layouts.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 Item { diff --git a/examples/quick/controls/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml index be334458..5474f1ba 100644 --- a/examples/quick/controls/gallery/content/ModelView.qml +++ b/examples/quick/controls/gallery/content/ModelView.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 //import QtQuick.XmlListModel 2.1 Item { diff --git a/examples/quick/controls/gallery/content/Styles.qml b/examples/quick/controls/gallery/content/Styles.qml index ed237d82..f78ab69f 100644 --- a/examples/quick/controls/gallery/content/Styles.qml +++ b/examples/quick/controls/gallery/content/Styles.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Particles 2.0 import QtQuick.Layouts 1.0 diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml index 7250bb31..0ca8c7cf 100644 --- a/examples/quick/controls/gallery/main.qml +++ b/examples/quick/controls/gallery/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuick.Dialogs 1.0 import "content" diff --git a/examples/quick/controls/splitview/main.qml b/examples/quick/controls/splitview/main.qml index d93c74d3..8707b6cc 100644 --- a/examples/quick/controls/splitview/main.qml +++ b/examples/quick/controls/splitview/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/examples/quick/controls/tableview/main.qml b/examples/quick/controls/tableview/main.qml index 553187b6..40ea8c39 100644 --- a/examples/quick/controls/tableview/main.qml +++ b/examples/quick/controls/tableview/main.qml @@ -44,7 +44,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.XmlListModel 2.0 Window { diff --git a/examples/quick/controls/texteditor/qml/main.qml b/examples/quick/controls/texteditor/qml/main.qml index 89120094..1a66afa5 100644 --- a/examples/quick/controls/texteditor/qml/main.qml +++ b/examples/quick/controls/texteditor/qml/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.1 diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml index 4cfb5694..f7f541bc 100644 --- a/examples/quick/controls/touch/content/ButtonPage.qml +++ b/examples/quick/controls/touch/content/ButtonPage.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Item { diff --git a/examples/quick/controls/touch/content/ListPage.qml b/examples/quick/controls/touch/content/ListPage.qml index 65dc99f5..4e2dbeb8 100644 --- a/examples/quick/controls/touch/content/ListPage.qml +++ b/examples/quick/controls/touch/content/ListPage.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 ScrollView { diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quick/controls/touch/content/ProgressBarPage.qml index 019d7206..efcec5ee 100644 --- a/examples/quick/controls/touch/content/ProgressBarPage.qml +++ b/examples/quick/controls/touch/content/ProgressBarPage.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Item { diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quick/controls/touch/content/SliderPage.qml index 91f1504d..f6931800 100644 --- a/examples/quick/controls/touch/content/SliderPage.qml +++ b/examples/quick/controls/touch/content/SliderPage.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Item { diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml index c9bebccd..3ffd45ba 100644 --- a/examples/quick/controls/touch/content/TabBarPage.qml +++ b/examples/quick/controls/touch/content/TabBarPage.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Item { diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quick/controls/touch/content/TextInputPage.qml index 0eeea03a..c0e60d62 100644 --- a/examples/quick/controls/touch/content/TextInputPage.qml +++ b/examples/quick/controls/touch/content/TextInputPage.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Item { diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml index c794f7dc..4efea3cb 100644 --- a/examples/quick/controls/touch/main.qml +++ b/examples/quick/controls/touch/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import "content" ApplicationWindow { diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml index 3b0c84c6..c44284df 100644 --- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.1 Item { diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml index 05e3b5b0..6bdaf7bc 100644 --- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.0 diff --git a/examples/quick/dialogs/systemdialogs/FontDialogs.qml b/examples/quick/dialogs/systemdialogs/FontDialogs.qml index da96d09d..dc8f245b 100644 --- a/examples/quick/dialogs/systemdialogs/FontDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/FontDialogs.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.1 Rectangle { diff --git a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml index 619a0b80..1bc9a4b6 100644 --- a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.0 diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qml b/examples/quick/dialogs/systemdialogs/systemdialogs.qml index f3372ea0..0c30d9e5 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qml +++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 ApplicationWindow { visible: true diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 72834287..fa9225be 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -40,7 +40,7 @@ import QtQuick.Window 2.1 import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/BusyIndicator.qml b/src/controls/BusyIndicator.qml index 25eb6dc5..e995579d 100644 --- a/src/controls/BusyIndicator.qml +++ b/src/controls/BusyIndicator.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Button.qml b/src/controls/Button.qml index afd7f381..facb711c 100644 --- a/src/controls/Button.qml +++ b/src/controls/Button.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml index 7249bd00..66b49345 100644 --- a/src/controls/CheckBox.qml +++ b/src/controls/CheckBox.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 20c4e1e5..c130abe8 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! @@ -204,7 +204,7 @@ Control { \qml import QtQuick 2.2 - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 ComboBox { editable: true diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml index 5b3d31f6..9ed90fa5 100644 --- a/src/controls/GroupBox.qml +++ b/src/controls/GroupBox.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.0 diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 4794c17f..0505a0a6 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 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 10f4ac25..0f9b502f 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 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 4a9547a7..1909e05c 100644 --- a/src/controls/Private/AbstractCheckable.qml +++ b/src/controls/Private/AbstractCheckable.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 /*! \qmltype AbstractCheckable diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index 8bbc0b7e..849315e9 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 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 754ff141..ff608b47 100644 --- a/src/controls/Private/ColumnMenuContent.qml +++ b/src/controls/Private/ColumnMenuContent.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Item { id: content diff --git a/src/controls/Private/FocusFrame.qml b/src/controls/Private/FocusFrame.qml index 1ad0af02..2262af72 100644 --- a/src/controls/Private/FocusFrame.qml +++ b/src/controls/Private/FocusFrame.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/MenuContentItem.qml b/src/controls/Private/MenuContentItem.qml index 678426d5..dbbf26a9 100644 --- a/src/controls/Private/MenuContentItem.qml +++ b/src/controls/Private/MenuContentItem.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Loader { diff --git a/src/controls/Private/MenuContentScroller.qml b/src/controls/Private/MenuContentScroller.qml index 0530cf6a..ccbeb55b 100644 --- a/src/controls/Private/MenuContentScroller.qml +++ b/src/controls/Private/MenuContentScroller.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 MouseArea { id: scrollIndicator diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index 0bebd1eb..b96cd61d 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index a5455938..bd30ad8e 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/StackViewSlideDelegate.qml b/src/controls/Private/StackViewSlideDelegate.qml index df5b60d2..dbacbffa 100644 --- a/src/controls/Private/StackViewSlideDelegate.qml +++ b/src/controls/Private/StackViewSlideDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 /*! \qmltype StackViewSlideTransition diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml index 5d2822b9..e99db169 100644 --- a/src/controls/Private/Style.qml +++ b/src/controls/Private/Style.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/TabBar.qml b/src/controls/Private/TabBar.qml index 2af7d23c..29a40f3f 100644 --- a/src/controls/Private/TabBar.qml +++ b/src/controls/Private/TabBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 /*! \qmltype TabBar diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index 01deac63..6a001f14 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml index 420ef2be..730e3448 100644 --- a/src/controls/RadioButton.qml +++ b/src/controls/RadioButton.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index c72277d8..b18ebee7 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 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 3dd70475..ffea986c 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index 26ba41b0..c5281586 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index 5318105c..dadff049 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 as Private import QtQuick.Window 2.1 diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml index e19189d0..2f3d5753 100644 --- a/src/controls/StackView.qml +++ b/src/controls/StackView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml index af5870b0..be4791bb 100644 --- a/src/controls/StatusBar.qml +++ b/src/controls/StatusBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! @@ -59,7 +59,7 @@ import QtQuick.Controls.Private 1.0 Otherwise the height is platform dependent. \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml index 6a6b36c0..03c3812e 100644 --- a/src/controls/Styles/Base/BusyIndicatorStyle.qml +++ b/src/controls/Styles/Base/BusyIndicatorStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml index 7d4ae4d3..d0299a55 100644 --- a/src/controls/Styles/Base/ButtonStyle.qml +++ b/src/controls/Styles/Base/ButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml index f7e9bc7e..2dcaa9e9 100644 --- a/src/controls/Styles/Base/CheckBoxStyle.qml +++ b/src/controls/Styles/Base/CheckBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 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 9a0c80a6..0891392d 100644 --- a/src/controls/Styles/Base/ComboBoxStyle.qml +++ b/src/controls/Styles/Base/ComboBoxStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Styles/Base/FocusFrameStyle.qml b/src/controls/Styles/Base/FocusFrameStyle.qml index d935251b..de988d40 100644 --- a/src/controls/Styles/Base/FocusFrameStyle.qml +++ b/src/controls/Styles/Base/FocusFrameStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml index 45cce7c9..af8d41b6 100644 --- a/src/controls/Styles/Base/GroupBoxStyle.qml +++ b/src/controls/Styles/Base/GroupBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml index da8e1f97..8ab758f5 100644 --- a/src/controls/Styles/Base/MenuBarStyle.qml +++ b/src/controls/Styles/Base/MenuBarStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml index d1391ea1..0b1db87c 100644 --- a/src/controls/Styles/Base/MenuStyle.qml +++ b/src/controls/Styles/Base/MenuStyle.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml index de05faa5..0a98beef 100644 --- a/src/controls/Styles/Base/ProgressBarStyle.qml +++ b/src/controls/Styles/Base/ProgressBarStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml index c697decc..0f242eb0 100644 --- a/src/controls/Styles/Base/RadioButtonStyle.qml +++ b/src/controls/Styles/Base/RadioButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index 8e3e5efc..073a2e3f 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml index 11f3e15a..c03d96d5 100644 --- a/src/controls/Styles/Base/SliderStyle.qml +++ b/src/controls/Styles/Base/SliderStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml index 1d889b90..caa20abd 100644 --- a/src/controls/Styles/Base/SpinBoxStyle.qml +++ b/src/controls/Styles/Base/SpinBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/StatusBarStyle.qml b/src/controls/Styles/Base/StatusBarStyle.qml index 8e750519..78ea9b17 100644 --- a/src/controls/Styles/Base/StatusBarStyle.qml +++ b/src/controls/Styles/Base/StatusBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/SwitchStyle.qml b/src/controls/Styles/Base/SwitchStyle.qml index 94e86270..01779582 100644 --- a/src/controls/Styles/Base/SwitchStyle.qml +++ b/src/controls/Styles/Base/SwitchStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml index 758b6be6..dfb9b032 100644 --- a/src/controls/Styles/Base/TabViewStyle.qml +++ b/src/controls/Styles/Base/TabViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml index 31ea5073..667841bb 100644 --- a/src/controls/Styles/Base/TableViewStyle.qml +++ b/src/controls/Styles/Base/TableViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/TextAreaStyle.qml b/src/controls/Styles/Base/TextAreaStyle.qml index 91fc9489..7ad5686f 100644 --- a/src/controls/Styles/Base/TextAreaStyle.qml +++ b/src/controls/Styles/Base/TextAreaStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml index 3e371c8d..7dee691d 100644 --- a/src/controls/Styles/Base/TextFieldStyle.qml +++ b/src/controls/Styles/Base/TextFieldStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/ToolBarStyle.qml b/src/controls/Styles/Base/ToolBarStyle.qml index 82ad4f1f..7a89cefb 100644 --- a/src/controls/Styles/Base/ToolBarStyle.qml +++ b/src/controls/Styles/Base/ToolBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml index 9e4f3ccc..fc4dc606 100644 --- a/src/controls/Styles/Base/ToolButtonStyle.qml +++ b/src/controls/Styles/Base/ToolButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Desktop/ButtonStyle.qml b/src/controls/Styles/Desktop/ButtonStyle.qml index 07e1031b..5703d405 100644 --- a/src/controls/Styles/Desktop/ButtonStyle.qml +++ b/src/controls/Styles/Desktop/ButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml index 003d964a..6bb33663 100644 --- a/src/controls/Styles/Desktop/CheckBoxStyle.qml +++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml index b01940d1..facc8223 100644 --- a/src/controls/Styles/Desktop/ComboBoxStyle.qml +++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import "." as Desktop diff --git a/src/controls/Styles/Desktop/FocusFrameStyle.qml b/src/controls/Styles/Desktop/FocusFrameStyle.qml index e52235ed..ef55fc17 100644 --- a/src/controls/Styles/Desktop/FocusFrameStyle.qml +++ b/src/controls/Styles/Desktop/FocusFrameStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml index 75c9de8f..12989024 100644 --- a/src/controls/Styles/Desktop/GroupBoxStyle.qml +++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Styles/Desktop/MenuBarStyle.qml b/src/controls/Styles/Desktop/MenuBarStyle.qml index 6218ce9b..7ef760e2 100644 --- a/src/controls/Styles/Desktop/MenuBarStyle.qml +++ b/src/controls/Styles/Desktop/MenuBarStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 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 90ffa76d..4a0d5894 100644 --- a/src/controls/Styles/Desktop/MenuStyle.qml +++ b/src/controls/Styles/Desktop/MenuStyle.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ProgressBarStyle.qml b/src/controls/Styles/Desktop/ProgressBarStyle.qml index 633002a8..bab4d41b 100644 --- a/src/controls/Styles/Desktop/ProgressBarStyle.qml +++ b/src/controls/Styles/Desktop/ProgressBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml index 55d3b60e..49e3cace 100644 --- a/src/controls/Styles/Desktop/RadioButtonStyle.qml +++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ScrollViewStyle.qml b/src/controls/Styles/Desktop/ScrollViewStyle.qml index 8fd559f4..ac919bba 100644 --- a/src/controls/Styles/Desktop/ScrollViewStyle.qml +++ b/src/controls/Styles/Desktop/ScrollViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/SliderStyle.qml b/src/controls/Styles/Desktop/SliderStyle.qml index d11baad5..e1585685 100644 --- a/src/controls/Styles/Desktop/SliderStyle.qml +++ b/src/controls/Styles/Desktop/SliderStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml index 56f1f62e..ba897bfb 100644 --- a/src/controls/Styles/Desktop/SpinBoxStyle.qml +++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/StatusBarStyle.qml b/src/controls/Styles/Desktop/StatusBarStyle.qml index 0c4ba020..8b019815 100644 --- a/src/controls/Styles/Desktop/StatusBarStyle.qml +++ b/src/controls/Styles/Desktop/StatusBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Desktop/SwitchStyle.qml b/src/controls/Styles/Desktop/SwitchStyle.qml index 54ce0553..6a5d5924 100644 --- a/src/controls/Styles/Desktop/SwitchStyle.qml +++ b/src/controls/Styles/Desktop/SwitchStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 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 bde5e3f4..9244c7d8 100644 --- a/src/controls/Styles/Desktop/TabViewStyle.qml +++ b/src/controls/Styles/Desktop/TabViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.1 Style { diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml index 814618de..33cc6779 100644 --- a/src/controls/Styles/Desktop/TableViewStyle.qml +++ b/src/controls/Styles/Desktop/TableViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import "." diff --git a/src/controls/Styles/Desktop/TextAreaStyle.qml b/src/controls/Styles/Desktop/TextAreaStyle.qml index 201dafa9..46750c1a 100644 --- a/src/controls/Styles/Desktop/TextAreaStyle.qml +++ b/src/controls/Styles/Desktop/TextAreaStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 ScrollViewStyle { diff --git a/src/controls/Styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml index 77de5e5a..c7e85ff4 100644 --- a/src/controls/Styles/Desktop/TextFieldStyle.qml +++ b/src/controls/Styles/Desktop/TextFieldStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ToolBarStyle.qml b/src/controls/Styles/Desktop/ToolBarStyle.qml index eac5405f..e019bda4 100644 --- a/src/controls/Styles/Desktop/ToolBarStyle.qml +++ b/src/controls/Styles/Desktop/ToolBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Desktop/ToolButtonStyle.qml b/src/controls/Styles/Desktop/ToolButtonStyle.qml index cc5736b1..59fc7824 100644 --- a/src/controls/Styles/Desktop/ToolButtonStyle.qml +++ b/src/controls/Styles/Desktop/ToolButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Switch.qml b/src/controls/Switch.qml index f81991af..bafb567c 100644 --- a/src/controls/Switch.qml +++ b/src/controls/Switch.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml index b185c24c..8f09cf3c 100644 --- a/src/controls/TabView.qml +++ b/src/controls/TabView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index a3da455e..dd4ee389 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.1 import QtQuick.Window 2.1 diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 82265075..a8be977d 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! \qmltype TextArea diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index 49393d3f..70ed7bac 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! @@ -382,7 +382,7 @@ Control { \code import QtQuick 2.2 - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 TextField { validator: IntValidator {bottom: 11; top: 31;} diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml index e3d5d3ea..90f9d4a3 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! @@ -61,7 +61,7 @@ import QtQuick.Controls.Private 1.0 Otherwise the height is platform dependent. \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index f1dec720..8bc466ea 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/controls.pro b/src/controls/controls.pro index e19d5d18..e7cd6ada 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrolsplugin TARGETPATH = QtQuick/Controls -IMPORT_VERSION = 1.1 +IMPORT_VERSION = 1.2 QT += qml quick gui-private core-private diff --git a/src/controls/doc/src/qtquickcontrols-overview.qdoc b/src/controls/doc/src/qtquickcontrols-overview.qdoc index 5dda0375..dc424673 100644 --- a/src/controls/doc/src/qtquickcontrols-overview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-overview.qdoc @@ -38,7 +38,7 @@ The QML types can be imported into your application using the following import statement in your \c {.qml} file. \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 \endcode \section1 Creating a basic example @@ -46,7 +46,7 @@ A basic example of a QML file that makes use of controls is shown here: \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 ApplicationWindow { title: "My Application" diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml index 14e1323e..c2de493c 100644 --- a/src/dialogs/DefaultColorDialog.qml +++ b/src/dialogs/DefaultColorDialog.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.0 import QtQuick.Window 2.1 import "qml" diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml index 06777141..0771bdb9 100644 --- a/src/dialogs/DefaultDialogWrapper.qml +++ b/src/dialogs/DefaultDialogWrapper.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml index 767939b3..af5d7b0b 100644 --- a/src/dialogs/DefaultFileDialog.qml +++ b/src/dialogs/DefaultFileDialog.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 as ControlsPrivate import QtQuick.Dialogs 1.1 import QtQuick.Dialogs.Private 1.1 diff --git a/src/dialogs/DefaultFontDialog.qml b/src/dialogs/DefaultFontDialog.qml index 2518ce95..c8eccf3f 100644 --- a/src/dialogs/DefaultFontDialog.qml +++ b/src/dialogs/DefaultFontDialog.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.0 import QtQuick.Dialogs 1.1 import QtQuick.Dialogs.Private 1.1 diff --git a/src/dialogs/DefaultMessageDialog.qml b/src/dialogs/DefaultMessageDialog.qml index 932dbfe3..5fa46cc3 100644 --- a/src/dialogs/DefaultMessageDialog.qml +++ b/src/dialogs/DefaultMessageDialog.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.1 import "qml" diff --git a/src/layouts/doc/src/snippets/windowconstraints.qml b/src/layouts/doc/src/snippets/windowconstraints.qml index 5daf8a08..956989a3 100644 --- a/src/layouts/doc/src/snippets/windowconstraints.qml +++ b/src/layouts/doc/src/snippets/windowconstraints.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml index a434beb2..dcb82444 100644 --- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml +++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Item { id: main diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml index c369619e..a1895224 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/applicationwindow/data/activefocusontab.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml index 194411db..300edee0 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/controls/data/combobox/cb_keys.qml b/tests/auto/controls/data/combobox/cb_keys.qml index 0e75fddb..8f79dd56 100644 --- a/tests/auto/controls/data/combobox/cb_keys.qml +++ b/tests/auto/controls/data/combobox/cb_keys.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 100 diff --git a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml index af784519..6d2b1405 100644 --- a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml +++ b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Column { width: 200 diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml index 1c285de1..b912f806 100644 --- a/tests/auto/controls/data/rangemodel/rangemodel.qml +++ b/tests/auto/controls/data/rangemodel/rangemodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 RangeModel { diff --git a/tests/auto/controls/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml index c0dd6cbc..97a575e7 100644 --- a/tests/auto/controls/data/shortcut/shortcuts.qml +++ b/tests/auto/controls/data/shortcut/shortcuts.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Rectangle { width: 300 diff --git a/tests/auto/controls/data/spinbox/sb_keys.qml b/tests/auto/controls/data/spinbox/sb_keys.qml index 39671835..8be67bfa 100644 --- a/tests/auto/controls/data/spinbox/sb_keys.qml +++ b/tests/auto/controls/data/spinbox/sb_keys.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 100 diff --git a/tests/auto/controls/data/spinbox/sp_editingfinished.qml b/tests/auto/controls/data/spinbox/sp_editingfinished.qml index d85e6eae..9d5f29bd 100644 --- a/tests/auto/controls/data/spinbox/sp_editingfinished.qml +++ b/tests/auto/controls/data/spinbox/sp_editingfinished.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 100 diff --git a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml index 1c8b06b2..ea7080a2 100644 --- a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml +++ b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml index 5f343ff9..7578a73a 100644 --- a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml +++ b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table3_qobjectlist.qml b/tests/auto/controls/data/tableview/table3_qobjectlist.qml index 9cd36cbb..6cb0cfde 100644 --- a/tests/auto/controls/data/tableview/table3_qobjectlist.qml +++ b/tests/auto/controls/data/tableview/table3_qobjectlist.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table4_qstringlist.qml b/tests/auto/controls/data/tableview/table4_qstringlist.qml index 61416ea1..8264776d 100644 --- a/tests/auto/controls/data/tableview/table4_qstringlist.qml +++ b/tests/auto/controls/data/tableview/table4_qstringlist.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table5_listmodel.qml b/tests/auto/controls/data/tableview/table5_listmodel.qml index b7ac4ca7..b5411f84 100644 --- a/tests/auto/controls/data/tableview/table5_listmodel.qml +++ b/tests/auto/controls/data/tableview/table5_listmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { currentRow: 0 diff --git a/tests/auto/controls/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml index cd2d26b0..286abfc3 100644 --- a/tests/auto/controls/data/tableview/table6_countmodel.qml +++ b/tests/auto/controls/data/tableview/table6_countmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { model: 3 // qml diff --git a/tests/auto/controls/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml index 00dd99c0..bb9e5414 100644 --- a/tests/auto/controls/data/tableview/table7_arraymodel.qml +++ b/tests/auto/controls/data/tableview/table7_arraymodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { model: ["A", "B", "C"] // qml diff --git a/tests/auto/controls/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml index 23c523fa..55fa12f2 100644 --- a/tests/auto/controls/data/tableview/table8_itemmodel.qml +++ b/tests/auto/controls/data/tableview/table8_itemmodel.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { model: Item { x: 10 }// qml diff --git a/tests/auto/controls/data/tableview/table_activated.qml b/tests/auto/controls/data/tableview/table_activated.qml index b4cd13aa..bffae603 100644 --- a/tests/auto/controls/data/tableview/table_activated.qml +++ b/tests/auto/controls/data/tableview/table_activated.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { height: 120 diff --git a/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml b/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml index 28b1198c..878d57c3 100644 --- a/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml +++ b/tests/auto/controls/data/tableview/table_activeFocusOnTab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Item { width: 200 diff --git a/tests/auto/controls/data/tableview/table_buttondelegate.qml b/tests/auto/controls/data/tableview/table_buttondelegate.qml index 93536bfe..923842fc 100644 --- a/tests/auto/controls/data/tableview/table_buttondelegate.qml +++ b/tests/auto/controls/data/tableview/table_buttondelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { id: table diff --git a/tests/auto/controls/data/tableview/table_delegate2.qml b/tests/auto/controls/data/tableview/table_delegate2.qml index b55a4c6c..d785e09e 100644 --- a/tests/auto/controls/data/tableview/table_delegate2.qml +++ b/tests/auto/controls/data/tableview/table_delegate2.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { id: table diff --git a/tests/auto/controls/data/tableview/table_delegate3.qml b/tests/auto/controls/data/tableview/table_delegate3.qml index 7d055df3..48eb9510 100644 --- a/tests/auto/controls/data/tableview/table_delegate3.qml +++ b/tests/auto/controls/data/tableview/table_delegate3.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { id: table diff --git a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml index 7709aea8..543b84bc 100644 --- a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml +++ b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { id: tableView diff --git a/tests/auto/controls/data/tableview/table_mousearea.qml b/tests/auto/controls/data/tableview/table_mousearea.qml index e5fd598e..c21e54ce 100644 --- a/tests/auto/controls/data/tableview/table_mousearea.qml +++ b/tests/auto/controls/data/tableview/table_mousearea.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { width:400 diff --git a/tests/auto/controls/data/tableview/table_multicolumns.qml b/tests/auto/controls/data/tableview/table_multicolumns.qml index cb81523d..c98b359b 100644 --- a/tests/auto/controls/data/tableview/table_multicolumns.qml +++ b/tests/auto/controls/data/tableview/table_multicolumns.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TableView { currentRow: 0 diff --git a/tests/auto/controls/data/tableview/table_resizecolumns.qml b/tests/auto/controls/data/tableview/table_resizecolumns.qml index 86427013..6cd63ec0 100644 --- a/tests/auto/controls/data/tableview/table_resizecolumns.qml +++ b/tests/auto/controls/data/tableview/table_resizecolumns.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2; -import QtQuick.Controls 1.1; +import QtQuick.Controls 1.2; TableView { TableViewColumn { diff --git a/tests/auto/controls/data/textarea/ta_keys.qml b/tests/auto/controls/data/textarea/ta_keys.qml index e810bbc9..150b6ad7 100644 --- a/tests/auto/controls/data/textarea/ta_keys.qml +++ b/tests/auto/controls/data/textarea/ta_keys.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 100 diff --git a/tests/auto/controls/data/textfield/tf_editingfinished.qml b/tests/auto/controls/data/textfield/tf_editingfinished.qml index d38423a4..7783a851 100644 --- a/tests/auto/controls/data/textfield/tf_editingfinished.qml +++ b/tests/auto/controls/data/textfield/tf_editingfinished.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 100 diff --git a/tests/auto/controls/data/textfield/tf_keys.qml b/tests/auto/controls/data/textfield/tf_keys.qml index 4124651d..2d6ca0e5 100644 --- a/tests/auto/controls/data/textfield/tf_keys.qml +++ b/tests/auto/controls/data/textfield/tf_keys.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 100 diff --git a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml index 788b272f..b3f1de10 100644 --- a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 200 diff --git a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml index 42a51d57..7fe8ed72 100644 --- a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 100 diff --git a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml index ae454a73..e74e8cbd 100644 --- a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml +++ b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Row { width: 200 diff --git a/tests/auto/controls/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml index 47e1c218..91e8c2e5 100644 --- a/tests/auto/controls/data/tst_applicationwindow.qml +++ b/tests/auto/controls/data/tst_applicationwindow.qml @@ -56,7 +56,7 @@ TestCase { function test_minimumHeight() { var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ ApplicationWindow { \ visible: true; \ width: 100; height: 100; \ @@ -149,7 +149,7 @@ TestCase { } var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ import QtQuick.Layouts 1.1; \ ApplicationWindow { \ id: window; \ @@ -170,7 +170,7 @@ TestCase { function test_minimumSizeLargerThan_MaximumSize() { var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ import QtQuick.Layouts 1.1; \ ApplicationWindow { \ minimumWidth: 200; \ @@ -208,7 +208,7 @@ TestCase { function test_defaultSizeHints() { var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ import QtQuick.Layouts 1.1; \ ApplicationWindow { \ Rectangle { \ diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml index c949788b..ef93d7bd 100644 --- a/tests/auto/controls/data/tst_busyindicator.qml +++ b/tests/auto/controls/data/tst_busyindicator.qml @@ -54,7 +54,7 @@ Item { height:400 function test_createIndicator() { - var indicator = Qt.createQmlObject('import QtQuick.Controls 1.1; BusyIndicator {}', testCase, ''); + var indicator = Qt.createQmlObject('import QtQuick.Controls 1.2; BusyIndicator {}', testCase, ''); indicator.running = true indicator.destroy() } diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index ad06045e..edc1f308 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -55,18 +55,18 @@ TestCase { height:400 function test_isDefault() { - var tmp = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button1}', testCase, ''); + var tmp = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {id: button1}', testCase, ''); compare(tmp.isDefault, false); tmp.destroy() } function test_text() { - var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button2_1}', testCase, ''); + var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {id: button2_1}', testCase, ''); compare(tmp1.text, ""); tmp1.text = "Hello"; compare(tmp1.text, "Hello"); - var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button2_2; text: "Hello"}', testCase, ''); + var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {id: button2_2; text: "Hello"}', testCase, ''); compare(tmp2.text, "Hello"); tmp1.destroy() tmp2.destroy() @@ -80,7 +80,7 @@ TestCase { function test_action() { var test_actionStr = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ property var testAction: Action { \ id: testAction; \ @@ -110,7 +110,7 @@ TestCase { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -127,7 +127,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ @@ -204,7 +204,7 @@ TestCase { } function test_checked() { - var button = Qt.createQmlObject('import QtQuick.Controls 1.1; Button { checkable: true }', container, '') + var button = Qt.createQmlObject('import QtQuick.Controls 1.2; Button { checkable: true }', container, '') var checkCount = 0 diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index dc52238b..dcc55fb2 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -61,7 +61,7 @@ Item { } function init() { - checkBox = Qt.createQmlObject("import QtQuick.Controls 1.1; CheckBox { }", container, ""); + checkBox = Qt.createQmlObject("import QtQuick.Controls 1.2; CheckBox { }", container, ""); } function cleanup() { @@ -169,7 +169,7 @@ Item { } function test_check_keep_binding() { - var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.2; \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.2; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.2; \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.2; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.2; \n" + "Row { \n" + " property alias checkBox1: checkBox1 \n" + " property alias checkBox2: checkBox2 \n" @@ -282,7 +282,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 721284cf..8910a30e 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -77,7 +77,7 @@ TestCase { } function test_keyupdown() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: 4 }', testCase, ''); compare(comboBox.currentIndex, 0) @@ -93,7 +93,7 @@ TestCase { } function test_textrole() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.textRole = "text" comboBox.model = model compare(comboBox.currentIndex, 0) @@ -110,7 +110,7 @@ TestCase { 'Coconut' ]; - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.model = arrayModel compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "Banana") @@ -124,7 +124,7 @@ TestCase { {text: 'Coconut', color: 'Brown'} ]; - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { }', testCase, ''); comboBox.textRole = "text" comboBox.model = arrayModel compare(comboBox.currentIndex, 0) @@ -137,13 +137,13 @@ TestCase { function test_arrayModelWithoutTextRole() { var arrayModel = ['Banana', 'Coconut', 'Apple'] - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.model = arrayModel compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "Banana") comboBox.destroy() - comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.editable = true comboBox.model = arrayModel compare(comboBox.currentIndex, 0) @@ -153,7 +153,7 @@ TestCase { function test_validator() { var comboBox = Qt.createQmlObject('import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ ComboBox { \ editable: true; \ validator: RegExpValidator { \ @@ -189,7 +189,7 @@ TestCase { } function test_append_find() { - var comboBox = Qt.createQmlObject( 'import QtQuick.Controls 1.1; \ + var comboBox = Qt.createQmlObject( 'import QtQuick.Controls 1.2; \ import QtQuick 2.2; \ ComboBox { \ model:ListModel{ListElement{text:"first"}} \ @@ -225,7 +225,7 @@ TestCase { function test_editable() { var arrayModel = ['Banana', 'Coco', 'Coconut', 'Apple', 'Cocomuffin' ] - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1; \ + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2; \ ComboBox { \ property int acceptedCount: 0; \ onAccepted: ++acceptedCount; \ @@ -331,7 +331,7 @@ TestCase { function test_keySearch() { var arrayModel = ['Banana', 'Coco', 'Coconut', 'Apple', 'Cocomuffin' ] - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.model = arrayModel compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "Banana") @@ -362,7 +362,7 @@ TestCase { function test_textAt() { var arrayModel = ['Banana', 'Coco', 'Coconut', 'Apple', 'Cocomuffin' ] - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.model = arrayModel compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "Banana") @@ -378,7 +378,7 @@ TestCase { function test_find() { var arrayModel = ['Banana', 'banana', 'Coconut', 'Apple', 'Cocomuffin' ] - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.model = arrayModel compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "Banana") @@ -392,7 +392,7 @@ TestCase { function test_activated() { var arrayModel = ['Banana', 'Coco', 'Coconut', 'Apple', 'Cocomuffin' ] - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1; \ + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2; \ ComboBox { \ property int activatedCount: 0; \ onActivated: ++activatedCount; \ @@ -420,7 +420,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ @@ -491,7 +491,7 @@ TestCase { if (Qt.platform.os === "osx") skip("When the menu pops up on OS X, it does not return and the test fails after time out") - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: 4 }', container, ''); comboBox.activeFocusOnPress = false verify(!comboBox.activeFocus) if (Qt.platform.os === "osx") // on mac when the menu open, the __popup function does not return @@ -514,7 +514,7 @@ TestCase { if (Qt.platform.os === "osx") skip("When the menu pops up on OS X, it does not return and the test fails after time out") - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: 4 }', container, ''); var menuIndex = getMenuIndex(comboBox) verify(menuIndex !== -1) comboBox.forceActiveFocus() @@ -533,7 +533,7 @@ TestCase { if (Qt.platform.os === "osx") skip("When the menu pops up on OS X, it does not return and the test fails after time out") - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: 4 }', container, ''); var menuIndex = getMenuIndex(comboBox) comboBox.currentIndex = 2 verify(menuIndex !== -1) @@ -570,7 +570,7 @@ TestCase { } function test_modelChange() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: ["a", "b", "c", "d"] }', container, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: ["a", "b", "c", "d"] }', container, ''); modelSpy.target = textSpy.target = indexSpy.target = comboBox compare(comboBox.currentIndex, 0) @@ -614,7 +614,7 @@ TestCase { } function test_addRemoveItemsInModel_QTBUG_30379() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox {}', testCase, ''); comboBox.textRole = "text" comboBox.model = model var menuIndex = getMenuIndex(comboBox) @@ -631,7 +631,7 @@ TestCase { } function test_width_QTBUG_30377() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: ["A", "BB", "CCCCC"] }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { model: ["A", "BB", "CCCCC"] }', testCase, ''); compare(comboBox.currentIndex, 0) var initialWidth = comboBox.width comboBox.currentIndex = 1 @@ -642,7 +642,7 @@ TestCase { } function test_stringListModel() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { }', testCase, ''); comboBox.model = model_qstringlist; compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "A") @@ -656,7 +656,7 @@ TestCase { } function test_variantListModel() { - var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { }', testCase, ''); + var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2 ; ComboBox { }', testCase, ''); comboBox.model = model_qvarlist; compare(comboBox.currentIndex, 0) compare(comboBox.currentText, "3") @@ -682,8 +682,8 @@ TestCase { } function test_minusOneIndexResetsSelection_QTBUG_35794() { - var qmlObjects = ['import QtQuick.Controls 1.1 ; ComboBox { model: ["A", "B", "C"] }', - 'import QtQuick.Controls 1.1 ; ComboBox { editable: true; model: ["A", "B", "C"] }'] + var qmlObjects = ['import QtQuick.Controls 1.2 ; ComboBox { model: ["A", "B", "C"] }', + 'import QtQuick.Controls 1.2 ; ComboBox { editable: true; model: ["A", "B", "C"] }'] for (var i = 0; i < qmlObjects.length; i++) { var comboBox = Qt.createQmlObject(qmlObjects[i], testCase, ''); compare(comboBox.currentIndex, 0) diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index 977527ef..720bc73c 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 Item { @@ -91,7 +91,7 @@ TestCase { function test_dynamicSize() { - var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '') + var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.2; import QtQuick.Controls.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '') compare(groupbox.width, 16) compare(groupbox.height, 16) diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index 4a6e296c..04ebb5d0 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_createLabel() { - var label = Qt.createQmlObject('import QtQuick.Controls 1.1; Label {}', testCase, ''); + var label = Qt.createQmlObject('import QtQuick.Controls 1.2; Label {}', testCase, ''); label.destroy() } @@ -64,7 +64,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index c53ae22c..71bfc42e 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TestCase { id: testcase diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml index 4c2c25cf..3d1b6983 100644 --- a/tests/auto/controls/data/tst_menubar.qml +++ b/tests/auto/controls/data/tst_menubar.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createMenuBar() { - var menuBar = Qt.createQmlObject('import QtQuick.Controls 1.1; MenuBar {}', testCase, ''); + var menuBar = Qt.createQmlObject('import QtQuick.Controls 1.2; MenuBar {}', testCase, ''); menuBar.destroy() } } diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index 9f22300a..410b7934 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_minimumvalue() { - var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.2; ProgressBar {}', testCase, ''); progressBar.minimumValue = 5 progressBar.maximumValue = 10 @@ -69,7 +69,7 @@ TestCase { } function test_maximumvalue() { - var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.2; ProgressBar {}', testCase, ''); progressBar.minimumValue = 5 progressBar.maximumValue = 10 @@ -83,7 +83,7 @@ TestCase { } function test_invalidMinMax() { - var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, ''); + var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.2; ProgressBar {}', testCase, ''); // minimumValue has priority over maximum if they are inconsistent @@ -100,7 +100,7 @@ TestCase { progressBar.value = 12 compare(progressBar.value, progressBar.minimumValue) - var progressBar2 = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, ''); + var progressBar2 = Qt.createQmlObject('import QtQuick.Controls 1.2; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, ''); compare(progressBar.value, progressBar.minimumValue) progressBar.destroy() progressBar2.destroy() @@ -108,20 +108,20 @@ TestCase { function test_initialization_order() { - var progressBar = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar {maximumValue: 100; value: 50}", + var progressBar = Qt.createQmlObject("import QtQuick.Controls 1.2; ProgressBar {maximumValue: 100; value: 50}", testCase, '') compare(progressBar.value, 50); - var progressBar2 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar {" + + var progressBar2 = Qt.createQmlObject("import QtQuick.Controls 1.2; ProgressBar {" + "value: 50; maximumValue: 100}", testCase, '') compare(progressBar2.value, 50); - var progressBar3 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar { minimumValue: -50 ; value:-10}", + var progressBar3 = Qt.createQmlObject("import QtQuick.Controls 1.2; ProgressBar { minimumValue: -50 ; value:-10}", testCase, '') compare(progressBar3.value, -10); - var progressBar4 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar { value:-10; minimumValue: -50}", + var progressBar4 = Qt.createQmlObject("import QtQuick.Controls 1.2; ProgressBar { value:-10; minimumValue: -50}", testCase, '') compare(progressBar4.value, -10); progressBar.destroy() @@ -135,7 +135,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index 6a6efcd4..97ee0c5b 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -61,7 +61,7 @@ Item { } function init() { - radioButton = Qt.createQmlObject('import QtQuick.Controls 1.1; RadioButton {}', container, ''); + radioButton = Qt.createQmlObject('import QtQuick.Controls 1.2; RadioButton {}', container, ''); } function cleanup() { @@ -139,7 +139,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.2; \n" + "Row { \n" + " property alias radioButton1: radioButton1 \n" + " property alias radioButton2: radioButton2 \n" @@ -196,7 +196,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_rangeddate.qml b/tests/auto/controls/data/tst_rangeddate.qml index ed58a685..22ea6fdd 100644 --- a/tests/auto/controls/data/tst_rangeddate.qml +++ b/tests/auto/controls/data/tst_rangeddate.qml @@ -51,7 +51,7 @@ Item { when: true property var rangedDate - readonly property string importsStr: "import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; " + readonly property string importsStr: "import QtQuick.Controls 1.2; import QtQuick.Controls.Private 1.0; " function init() { rangedDate = Qt.createQmlObject(importsStr + " RangedDate {}", container, ""); diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index 7184ddb5..98248ed9 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 Item { @@ -93,7 +93,7 @@ TestCase { function test_clickToCenter() { var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ import QtQuick.Controls.Styles 1.1; \ ScrollView { \ id: _control1; \ @@ -147,7 +147,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml index 5880e210..385314bc 100644 --- a/tests/auto/controls/data/tst_shortcuts.qml +++ b/tests/auto/controls/data/tst_shortcuts.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index f9136364..e5614566 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -63,7 +63,7 @@ Item { } function test_vertical() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', testCase, ''); verify(slider.height < slider.width) slider.orientation = Qt.Vertical; @@ -72,7 +72,7 @@ Item { } function test_minimumvalue() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 @@ -83,7 +83,7 @@ Item { } function test_maximumvalue() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 @@ -94,7 +94,7 @@ Item { } function test_rightLeftKeyPressed() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', container, ''); slider.forceActiveFocus() slider.maximumValue = 20 slider.minimumValue = 0 @@ -110,7 +110,7 @@ Item { } function test_mouseWheel() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', container, ''); slider.forceActiveFocus() slider.value = 0 slider.maximumValue = 300 @@ -153,7 +153,7 @@ Item { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -170,7 +170,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ @@ -240,7 +240,7 @@ Item { function test_updateValueWhileDragging() { var controlString = 'import QtQuick 2.2 ; \ - import QtQuick.Controls 1.1 ; \ + import QtQuick.Controls 1.2 ; \ import QtQuick.Controls.Styles 1.1; \ Slider { \ width: 200 ; \ @@ -270,7 +270,7 @@ Item { } function test_sliderOffset() { - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') // Don't move slider value if mouse is inside handle regtion mouseClick(control, control.width/2, control.height/2) compare(control.value, 0.5) @@ -285,7 +285,7 @@ Item { function test_valueAndHandlePosition() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {minimumValue: 0; maximumValue: 100; width: 100; height: 20; stepSize: 1}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {minimumValue: 0; maximumValue: 100; width: 100; height: 20; stepSize: 1}', container, ''); slider.forceActiveFocus() slider.value = 0 compare(slider.__handlePos, 0) diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 40191db8..c2efffbe 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -56,7 +56,7 @@ Item { property point downCoord: "0,0" function test_increment_key() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {maximumValue: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {maximumValue: 50}', container, '') spinbox.forceActiveFocus() compare(spinbox.maximumValue, 50) @@ -72,7 +72,7 @@ Item { } function test_decrement_key() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {minimumValue: 10}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {minimumValue: 10}', container, '') spinbox.forceActiveFocus() compare(spinbox.minimumValue, 10) @@ -88,11 +88,11 @@ Item { } function test_initial_value() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {decimals: 3 ; value: 0.25}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {decimals: 3 ; value: 0.25}', container, '') compare(spinbox.value, 0.25) spinbox.destroy() - spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {value: 0.25 ; decimals: 3}', container, '') + spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {value: 0.25 ; decimals: 3}', container, '') compare(spinbox.value, 0.25) spinbox.destroy() } @@ -128,7 +128,7 @@ Item { } function test_keyboard_input(data) { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.forceActiveFocus() if (data.decimals !== undefined) @@ -151,7 +151,7 @@ Item { } function test_increment_mouse() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {maximumValue: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {maximumValue: 50}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -167,7 +167,7 @@ Item { } function test_decrement_mouse() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {minimumValue: 10}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {minimumValue: 10}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -183,7 +183,7 @@ Item { } function test_move_mouse() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.forceActiveFocus() setCoordinates(spinbox) @@ -208,7 +208,7 @@ Item { } function test_maxvalue() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.value = spinbox.maximumValue + 1 compare(spinbox.value, spinbox.maximumValue) @@ -225,7 +225,7 @@ Item { } function test_minvalue() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.value = spinbox.minimumValue - 1 compare(spinbox.value, spinbox.minimumValue) @@ -242,7 +242,7 @@ Item { } function test_decimals() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.decimals = 0 spinbox.value = 1.00001 @@ -269,7 +269,7 @@ Item { } function test_groupSeparators() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox { maximumValue: 1000 }', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox { maximumValue: 1000 }', container, '') spinbox.value = 1000 // QTBUG-31839: SpinBox displays group separators @@ -280,7 +280,7 @@ Item { function test_stepsize() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.stepSize = 2 @@ -299,7 +299,7 @@ Item { function test_negativeStepSize() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = -50 @@ -331,12 +331,12 @@ Item { function test_initialization_order() { - var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.1; SpinBox { id: spinbox;" + + var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.2; SpinBox { id: spinbox;" + "maximumValue: 2000; value: 1000; implicitWidth:80}", container, '') compare(spinbox.value, 1000); - var spinbox2 = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox { minimumValue: -1000 ; value:-1000}', + var spinbox2 = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox { minimumValue: -1000 ; value:-1000}', container, '') compare(spinbox2.value, -1000); spinbox.destroy() @@ -344,7 +344,7 @@ Item { } function test_setFontsize(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; SpinBox {style: SpinBoxStyle{}}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; import QtQuick.Controls.Styles 1.1; SpinBox {style: SpinBoxStyle{}}', container, '') var width = control.width; var height = control.height; control.font.pixelSize = 40 @@ -355,7 +355,7 @@ Item { function test_get_active_focus_when_up_or_down_was_pressed(){ var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Column { \ property alias spinbox: _spinbox; \ property alias textfield: _textfield; \ @@ -424,7 +424,7 @@ Item { } function test_activeFocusOnPress(){ - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {x: 20; y: 20; width: 100; height: 50}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {x: 20; y: 20; width: 100; height: 50}', container, '') spinbox.activeFocusOnPress = false verify(!spinbox.activeFocus) mouseClick(spinbox, 30, 30) @@ -438,7 +438,7 @@ Item { function test_activeFocusOnTab() { var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ @@ -508,7 +508,7 @@ Item { function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = -50 spinbox.maximumValue = 50 @@ -543,7 +543,7 @@ Item { } function test_wheel() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox {}', container, '') spinbox.forceActiveFocus() spinbox.minimumValue = 0 spinbox.maximumValue = 99 @@ -590,7 +590,7 @@ Item { // onValueChanged should not be emitted during construction. var root = Qt.createQmlObject(" import QtQuick 2.2 - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 Item { id: root property bool ok: true @@ -619,7 +619,7 @@ Item { } function test_fixup() { - var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox { minimumValue: -1 }', container, '') + var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.2; SpinBox { minimumValue: -1 }', container, '') verify(spinbox) spinbox.forceActiveFocus() verify(spinbox.activeFocus) diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml index b5311b03..64436c46 100644 --- a/tests/auto/controls/data/tst_splitview.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tst_stack.qml b/tests/auto/controls/data/tst_stack.qml index eb2b47d4..7141e1db 100644 --- a/tests/auto/controls/data/tst_stack.qml +++ b/tests/auto/controls/data/tst_stack.qml @@ -49,17 +49,17 @@ TestCase { height:400 function test_index() { - var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property int index: Stack.index }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; Item { property int index: Stack.index }', testCase, ''); compare(item.index, -1); } function test_status() { - var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property int status: Stack.status }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; Item { property int status: Stack.status }', testCase, ''); compare(item.status, 0); // Stack.Inactive } function test_view() { - var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; Item { property StackView view: Stack.view }', testCase, ''); + var item = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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 5e13acdd..848be725 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml index 23433db4..dc61dde0 100644 --- a/tests/auto/controls/data/tst_statusbar.qml +++ b/tests/auto/controls/data/tst_statusbar.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_createStatusBar() { - var statusBar = Qt.createQmlObject('import QtQuick.Controls 1.1; StatusBar {}', container, ''); + var statusBar = Qt.createQmlObject('import QtQuick.Controls 1.2; StatusBar {}', container, ''); statusBar.destroy() } @@ -64,7 +64,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_styles.qml b/tests/auto/controls/data/tst_styles.qml index c86ba44e..75b4ac24 100644 --- a/tests/auto/controls/data/tst_styles.qml +++ b/tests/auto/controls/data/tst_styles.qml @@ -55,112 +55,112 @@ Item { function test_createButtonStyle() { var control = Qt.createQmlObject( - 'import QtQuick 2.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \ + 'import QtQuick 2.2; import QtQuick.Controls 1.2; 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 eb622abf..dad39301 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -61,7 +61,7 @@ Item { } function init() { - aSwitch = Qt.createQmlObject("import QtQuick.Controls 1.1; Switch { }", container, ""); + aSwitch = Qt.createQmlObject("import QtQuick.Controls 1.2; Switch { }", container, ""); } function cleanup() { @@ -115,7 +115,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.1; \n" + var root = Qt.createQmlObject("import QtQuick 2.2; import QtQuick.Controls 1.2; \n" + "Row { \n" + " property alias aSwitch1: aSwitch1 \n" + " property alias aSwitch2: aSwitch2 \n" @@ -188,7 +188,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml index 999f148a..ae73504b 100644 --- a/tests/auto/controls/data/tst_tab.qml +++ b/tests/auto/controls/data/tst_tab.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createTab() { - var tab = Qt.createQmlObject('import QtQuick.Controls 1.1; Tab {}', testCase, ''); + var tab = Qt.createQmlObject('import QtQuick.Controls 1.2; Tab {}', testCase, ''); tab.destroy() } } diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 73e1c8d2..a9f07a8b 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuickControlsTests 1.0 Rectangle { @@ -72,7 +72,7 @@ TestCase { function test_basic_setup() { var test_instanceStr = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ TableView { \ TableViewColumn { \ } \ @@ -631,7 +631,7 @@ TestCase { } function test_columnWidth() { - var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView2 = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; TableView { }', testCase, ''); + var tableView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; TableView { }', testCase, ''); compare(tableView.columnCount, 0) var titles = ["title 1", "title 2", "title 3"] @@ -775,7 +775,7 @@ TestCase { function test_positionViewAtRow() { var test_instanceStr = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ TableView { \ TableViewColumn { \ } \ diff --git a/tests/auto/controls/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml index a88b3c6e..b7611355 100644 --- a/tests/auto/controls/data/tst_tableviewcolumn.qml +++ b/tests/auto/controls/data/tst_tableviewcolumn.qml @@ -49,7 +49,7 @@ TestCase { height:400 function test_createTableViewColumn() { - var tableViewColumn = Qt.createQmlObject('import QtQuick.Controls 1.1; TableViewColumn {}', testCase, ''); + var tableViewColumn = Qt.createQmlObject('import QtQuick.Controls 1.2; TableViewColumn {}', testCase, ''); tableViewColumn.destroy() } } diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml index 7c3b335f..b7de67ba 100644 --- a/tests/auto/controls/data/tst_tabview.qml +++ b/tests/auto/controls/data/tst_tabview.qml @@ -54,12 +54,12 @@ TestCase { height:400 function test_createTabView() { - var tabView = Qt.createQmlObject('import QtQuick.Controls 1.1; TabView {}', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick.Controls 1.2; TabView {}', testCase, ''); tabView.destroy() } function test_repeater() { - var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { } } }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; 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.2; 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.2; import QtQuick.Controls 1.1; TabView { }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; TabView { }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; TabView { }', testCase, ''); compare(tabView.count, 0) var titles = ["title 1", "title 2", "title 3"] @@ -194,7 +194,7 @@ TestCase { function test_dynamicTabs() { var test_tabView = ' \ import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ TabView { \ id: tabView; \ Tab { title: "static" } \ @@ -226,7 +226,7 @@ TestCase { function test_dynamicModel() { var test_tabView = ' \ import QtQuick 2.2; \ - import QtQuick.Controls 1.0; \ + import QtQuick.Controls 1.2; \ TabView { \ id: tabView; \ property alias repeater: repeater; \ @@ -247,7 +247,7 @@ TestCase { function test_mousePressOnTabBar() { var test_tabView = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Column { \ property alias tabview: _tabview; \ property alias textfield: _textfield; \ diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 3eced48c..10b86959 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -54,7 +54,7 @@ TestCase { height: 400 function test_append() { - var textarea = Qt.createQmlObject('import QtQuick.Controls 1.1; TextArea {}', testCase, '') + var textarea = Qt.createQmlObject('import QtQuick.Controls 1.2; TextArea {}', testCase, '') compare(textarea.text, "") @@ -67,7 +67,7 @@ TestCase { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; TextArea {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; TextArea {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -82,7 +82,7 @@ TestCase { function test_activeFocusOnTab() { // Set TextArea readonly so the tab/backtab can be tested toward the navigation var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index e7bd7d81..d3bf6553 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -53,7 +53,7 @@ TestCase { height: 400 function test_text() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', testCase, '') compare(textfield.text, "") textfield.text = "hello world" @@ -62,7 +62,7 @@ TestCase { } function test_maximumLength() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', testCase, '') textfield.text = "hello world" textfield.maximumLength = 5 @@ -71,7 +71,7 @@ TestCase { } function test_length() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', testCase, '') textfield.text = "hello world" compare(textfield.length, 11) @@ -80,7 +80,7 @@ TestCase { function test_readonly() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() compare(textfield.readOnly, false) @@ -92,7 +92,7 @@ TestCase { } function test_inputMask() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container , '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container , '') textfield.forceActiveFocus() // +/- not required, 1 digit required, 1 aphabetic character required and 2 digits not required @@ -131,7 +131,7 @@ TestCase { } function test_validator() { - var textfield = Qt.createQmlObject('import QtQuick 2.2; 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.2; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') textfield.text = "blu" compare(textfield.acceptableInput, false) @@ -145,7 +145,7 @@ TestCase { } function test_selectAll() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -157,7 +157,7 @@ TestCase { } function test_select() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -172,7 +172,7 @@ TestCase { } function test_cursorPosition() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() compare(textfield.cursorPosition, 0) @@ -188,7 +188,7 @@ TestCase { } function test_selectWord() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -201,7 +201,7 @@ TestCase { } function test_copyPaste() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', testCase, '') textfield.text = "this is my text" textfield.select(0, 5) textfield.copy() @@ -212,7 +212,7 @@ TestCase { } function test_getText() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -222,7 +222,7 @@ TestCase { } function test_insert() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -232,7 +232,7 @@ TestCase { } function test_deselect() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -243,7 +243,7 @@ TestCase { } function test_undo() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -255,7 +255,7 @@ TestCase { } function test_redo() { - var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '') + var textfield = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {}', container, '') textfield.forceActiveFocus() textfield.text = "this is my text" @@ -268,7 +268,7 @@ TestCase { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; TextField {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -281,7 +281,7 @@ TestCase { } function test_setFontsize(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; TextField {style:TextFieldStyle{}}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; import QtQuick.Controls.Styles 1.1; TextField {style:TextFieldStyle{}}', container, '') var width = control.width; var height = control.height; control.font.pixelSize = 40 @@ -293,7 +293,7 @@ TestCase { function test_activeFocusOnTab() { // Set TextField readonly so the tab/backtab can be tested toward the navigation var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index a4d61415..ee953a49 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -55,7 +55,7 @@ TestCase { height:400 function test_createToolBar() { - var toolBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolBar {}', container, ''); + var toolBar = Qt.createQmlObject('import QtQuick.Controls 1.2; ToolBar {}', container, ''); toolBar.destroy() } @@ -64,7 +64,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index 9ffa1776..698583c6 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -55,12 +55,12 @@ TestCase { height:400 function test_createToolButton() { - var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolButton {}', testCase, ''); + var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.2; ToolButton {}', testCase, ''); toolButton.destroy() } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolButton {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; ToolButton {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -77,7 +77,7 @@ TestCase { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ diff --git a/tests/manual/ApplicationWindow/main.qml b/tests/manual/ApplicationWindow/main.qml index c4330da3..6a59fd98 100644 --- a/tests/manual/ApplicationWindow/main.qml +++ b/tests/manual/ApplicationWindow/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml index 28e4b06f..ee518c14 100644 --- a/tests/manual/ContextMenu.qml +++ b/tests/manual/ContextMenu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Rectangle { diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml index 91cdba40..0f964cb2 100644 --- a/tests/manual/Layout.qml +++ b/tests/manual/Layout.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 Item { diff --git a/tests/manual/StackView.qml b/tests/manual/StackView.qml index 5c22072b..b95de4fa 100644 --- a/tests/manual/StackView.qml +++ b/tests/manual/StackView.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Window { width: 480 diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml index 8b05721d..83cd9d25 100644 --- a/tests/manual/WindowContextMenu.qml +++ b/tests/manual/WindowContextMenu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Window 2.1 Window { diff --git a/tests/manual/baselines/main.qml b/tests/manual/baselines/main.qml index 6edfdd68..4b7a36a3 100644 --- a/tests/manual/baselines/main.qml +++ b/tests/manual/baselines/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 ApplicationWindow { diff --git a/tests/manual/combobox/main.qml b/tests/manual/combobox/main.qml index 55441c9a..b9f1b36c 100644 --- a/tests/manual/combobox/main.qml +++ b/tests/manual/combobox/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.0 import QtQuick.Dialogs 1.0 diff --git a/tests/manual/popupwindowkeyevents.qml b/tests/manual/popupwindowkeyevents.qml index 8b521c96..8fd8c7f0 100644 --- a/tests/manual/popupwindowkeyevents.qml +++ b/tests/manual/popupwindowkeyevents.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Rectangle { diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml index 7c8b8891..61a8e97a 100644 --- a/tests/manual/scrollview/main.qml +++ b/tests/manual/scrollview/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml index aefcbc28..6e1450d0 100644 --- a/tests/manual/splitter.qml +++ b/tests/manual/splitter.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 ApplicationWindow { width: 400 diff --git a/tests/manual/stackview/ButtonMenu.qml b/tests/manual/stackview/ButtonMenu.qml index 684e026a..119aed84 100644 --- a/tests/manual/stackview/ButtonMenu.qml +++ b/tests/manual/stackview/ButtonMenu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 GridLayout { diff --git a/tests/manual/stackview/View.qml b/tests/manual/stackview/View.qml index f5872a47..58816883 100644 --- a/tests/manual/stackview/View.qml +++ b/tests/manual/stackview/View.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ColumnLayout { diff --git a/tests/manual/stackview/main.qml b/tests/manual/stackview/main.qml index f93bd7fa..ca54005d 100644 --- a/tests/manual/stackview/main.qml +++ b/tests/manual/stackview/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml index c8c5b73a..fef2f6ba 100644 --- a/tests/manual/stretching.qml +++ b/tests/manual/stretching.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Rectangle { diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml index d06e8780..9b65ce73 100644 --- a/tests/manual/stretchingcustom.qml +++ b/tests/manual/stretchingcustom.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Rectangle { diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml index 9bc0a0b9..e5b6dda7 100644 --- a/tests/manual/tableviewmodels/qml/main.qml +++ b/tests/manual/tableviewmodels/qml/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Rectangle { width: 360 diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml index 31cb5d77..daadf8d7 100644 --- a/tests/manual/testbench/content/PropertyLayouts.qml +++ b/tests/manual/testbench/content/PropertyLayouts.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 QtObject { diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index 87f7a71b..65e66379 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; 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.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.Checked", value: Qt.Checked}); enumModelData.append({ text: "Qt.Unchecked", value: Qt.Unchecked}); |