From 953b8d7ed82f2701ba8f6f572e60468da544c5ec Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Mon, 7 Apr 2014 10:37:35 +0200
Subject: [PATCH] Bump QtQuick.Controls import version to 1.2
Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
examples/quick/controls/basiclayouts/main.qml | 2 +-
.../controls/gallery/content/ChildWindow.qml | 2 +-
.../controls/gallery/content/Controls.qml | 2 +-
.../controls/gallery/content/Layouts.qml | 2 +-
.../controls/gallery/content/ModelView.qml | 2 +-
.../quick/controls/gallery/content/Styles.qml | 2 +-
examples/quick/controls/gallery/main.qml | 2 +-
examples/quick/controls/splitview/main.qml | 2 +-
examples/quick/controls/tableview/main.qml | 2 +-
.../quick/controls/texteditor/qml/main.qml | 2 +-
.../controls/touch/content/ButtonPage.qml | 2 +-
.../quick/controls/touch/content/ListPage.qml | 2 +-
.../touch/content/ProgressBarPage.qml | 2 +-
.../controls/touch/content/SliderPage.qml | 2 +-
.../controls/touch/content/TabBarPage.qml | 2 +-
.../controls/touch/content/TextInputPage.qml | 2 +-
examples/quick/controls/touch/main.qml | 2 +-
.../dialogs/systemdialogs/ColorDialogs.qml | 2 +-
.../dialogs/systemdialogs/FileDialogs.qml | 2 +-
.../dialogs/systemdialogs/FontDialogs.qml | 2 +-
.../dialogs/systemdialogs/MessageDialogs.qml | 2 +-
.../dialogs/systemdialogs/systemdialogs.qml | 2 +-
src/controls/ApplicationWindow.qml | 2 +-
src/controls/BusyIndicator.qml | 2 +-
src/controls/Button.qml | 2 +-
src/controls/CheckBox.qml | 2 +-
src/controls/ComboBox.qml | 4 +-
src/controls/GroupBox.qml | 2 +-
src/controls/Menu.qml | 2 +-
src/controls/MenuBar.qml | 2 +-
src/controls/Private/AbstractCheckable.qml | 2 +-
src/controls/Private/BasicButton.qml | 2 +-
src/controls/Private/ColumnMenuContent.qml | 2 +-
src/controls/Private/FocusFrame.qml | 2 +-
src/controls/Private/MenuContentItem.qml | 2 +-
src/controls/Private/MenuContentScroller.qml | 2 +-
src/controls/Private/ScrollBar.qml | 2 +-
src/controls/Private/ScrollViewHelper.qml | 2 +-
.../Private/StackViewSlideDelegate.qml | 2 +-
src/controls/Private/Style.qml | 2 +-
src/controls/Private/TabBar.qml | 2 +-
src/controls/ProgressBar.qml | 2 +-
src/controls/RadioButton.qml | 2 +-
src/controls/ScrollView.qml | 2 +-
src/controls/Slider.qml | 2 +-
src/controls/SpinBox.qml | 2 +-
src/controls/SplitView.qml | 2 +-
src/controls/StackView.qml | 2 +-
src/controls/StatusBar.qml | 4 +-
.../Styles/Base/BusyIndicatorStyle.qml | 2 +-
src/controls/Styles/Base/ButtonStyle.qml | 2 +-
src/controls/Styles/Base/CheckBoxStyle.qml | 2 +-
src/controls/Styles/Base/ComboBoxStyle.qml | 2 +-
src/controls/Styles/Base/FocusFrameStyle.qml | 2 +-
src/controls/Styles/Base/GroupBoxStyle.qml | 2 +-
src/controls/Styles/Base/MenuBarStyle.qml | 2 +-
src/controls/Styles/Base/MenuStyle.qml | 2 +-
src/controls/Styles/Base/ProgressBarStyle.qml | 2 +-
src/controls/Styles/Base/RadioButtonStyle.qml | 2 +-
src/controls/Styles/Base/ScrollViewStyle.qml | 2 +-
src/controls/Styles/Base/SliderStyle.qml | 2 +-
src/controls/Styles/Base/SpinBoxStyle.qml | 2 +-
src/controls/Styles/Base/StatusBarStyle.qml | 2 +-
src/controls/Styles/Base/SwitchStyle.qml | 2 +-
src/controls/Styles/Base/TabViewStyle.qml | 2 +-
src/controls/Styles/Base/TableViewStyle.qml | 2 +-
src/controls/Styles/Base/TextAreaStyle.qml | 2 +-
src/controls/Styles/Base/TextFieldStyle.qml | 2 +-
src/controls/Styles/Base/ToolBarStyle.qml | 2 +-
src/controls/Styles/Base/ToolButtonStyle.qml | 2 +-
src/controls/Styles/Desktop/ButtonStyle.qml | 2 +-
src/controls/Styles/Desktop/CheckBoxStyle.qml | 2 +-
src/controls/Styles/Desktop/ComboBoxStyle.qml | 2 +-
.../Styles/Desktop/FocusFrameStyle.qml | 2 +-
src/controls/Styles/Desktop/GroupBoxStyle.qml | 2 +-
src/controls/Styles/Desktop/MenuBarStyle.qml | 2 +-
src/controls/Styles/Desktop/MenuStyle.qml | 2 +-
.../Styles/Desktop/ProgressBarStyle.qml | 2 +-
.../Styles/Desktop/RadioButtonStyle.qml | 2 +-
.../Styles/Desktop/ScrollViewStyle.qml | 2 +-
src/controls/Styles/Desktop/SliderStyle.qml | 2 +-
src/controls/Styles/Desktop/SpinBoxStyle.qml | 2 +-
.../Styles/Desktop/StatusBarStyle.qml | 2 +-
src/controls/Styles/Desktop/SwitchStyle.qml | 2 +-
src/controls/Styles/Desktop/TabViewStyle.qml | 2 +-
.../Styles/Desktop/TableViewStyle.qml | 2 +-
src/controls/Styles/Desktop/TextAreaStyle.qml | 2 +-
.../Styles/Desktop/TextFieldStyle.qml | 2 +-
src/controls/Styles/Desktop/ToolBarStyle.qml | 2 +-
.../Styles/Desktop/ToolButtonStyle.qml | 2 +-
src/controls/Switch.qml | 2 +-
src/controls/TabView.qml | 2 +-
src/controls/TableView.qml | 2 +-
src/controls/TextArea.qml | 2 +-
src/controls/TextField.qml | 4 +-
src/controls/ToolBar.qml | 4 +-
src/controls/ToolButton.qml | 2 +-
src/controls/controls.pro | 2 +-
.../doc/src/qtquickcontrols-overview.qdoc | 4 +-
src/dialogs/DefaultColorDialog.qml | 2 +-
src/dialogs/DefaultDialogWrapper.qml | 2 +-
src/dialogs/DefaultFileDialog.qml | 2 +-
src/dialogs/DefaultFontDialog.qml | 2 +-
src/dialogs/DefaultMessageDialog.qml | 2 +-
.../doc/src/snippets/windowconstraints.qml | 2 +-
.../data/activeFocusOnTab.qml | 2 +-
.../data/activefocusontab.qml | 2 +-
.../data/basicapplicationwindow.qml | 2 +-
tests/auto/controls/data/combobox/cb_keys.qml | 2 +-
.../data/groupbox/gb_activeFocusOnTab.qml | 2 +-
.../controls/data/rangemodel/rangemodel.qml | 2 +-
.../auto/controls/data/shortcut/shortcuts.qml | 2 +-
tests/auto/controls/data/spinbox/sb_keys.qml | 2 +-
.../data/spinbox/sp_editingfinished.qml | 2 +-
.../data/tableview/table1_qobjectmodel.qml | 2 +-
.../tableview/table2_qabstractitemmodel.qml | 2 +-
.../data/tableview/table3_qobjectlist.qml | 2 +-
.../data/tableview/table4_qstringlist.qml | 2 +-
.../data/tableview/table5_listmodel.qml | 2 +-
.../data/tableview/table6_countmodel.qml | 2 +-
.../data/tableview/table7_arraymodel.qml | 2 +-
.../data/tableview/table8_itemmodel.qml | 2 +-
.../data/tableview/table_activated.qml | 2 +-
.../data/tableview/table_activeFocusOnTab.qml | 2 +-
.../data/tableview/table_buttondelegate.qml | 2 +-
.../data/tableview/table_delegate2.qml | 2 +-
.../data/tableview/table_delegate3.qml | 2 +-
.../data/tableview/table_dynamiccolumns.qml | 2 +-
.../data/tableview/table_mousearea.qml | 2 +-
.../data/tableview/table_multicolumns.qml | 2 +-
.../data/tableview/table_resizecolumns.qml | 2 +-
tests/auto/controls/data/textarea/ta_keys.qml | 2 +-
.../data/textfield/tf_editingfinished.qml | 2 +-
.../auto/controls/data/textfield/tf_keys.qml | 2 +-
...tb_checkableActionWithinExclusiveGroup.qml | 2 +-
.../data/toolbutton/tb_exclusivegroup.qml | 2 +-
.../toolbutton/tb_withCheckableAction.qml | 2 +-
.../controls/data/tst_applicationwindow.qml | 8 ++--
.../auto/controls/data/tst_busyindicator.qml | 2 +-
tests/auto/controls/data/tst_button.qml | 14 +++---
tests/auto/controls/data/tst_checkbox.qml | 10 ++--
tests/auto/controls/data/tst_combobox.qml | 48 +++++++++----------
tests/auto/controls/data/tst_groupbox.qml | 4 +-
tests/auto/controls/data/tst_label.qml | 4 +-
tests/auto/controls/data/tst_menu.qml | 2 +-
tests/auto/controls/data/tst_menubar.qml | 2 +-
tests/auto/controls/data/tst_progressbar.qml | 18 +++----
tests/auto/controls/data/tst_radiobutton.qml | 6 +--
tests/auto/controls/data/tst_rangeddate.qml | 2 +-
tests/auto/controls/data/tst_scrollview.qml | 6 +--
tests/auto/controls/data/tst_shortcuts.qml | 2 +-
tests/auto/controls/data/tst_slider.qml | 20 ++++----
tests/auto/controls/data/tst_spinbox.qml | 48 +++++++++----------
tests/auto/controls/data/tst_splitview.qml | 2 +-
tests/auto/controls/data/tst_stack.qml | 6 +--
tests/auto/controls/data/tst_stackview.qml | 2 +-
tests/auto/controls/data/tst_statusbar.qml | 4 +-
tests/auto/controls/data/tst_styles.qml | 32 ++++++-------
tests/auto/controls/data/tst_switch.qml | 6 +--
tests/auto/controls/data/tst_tab.qml | 2 +-
tests/auto/controls/data/tst_tableview.qml | 14 +++---
.../controls/data/tst_tableviewcolumn.qml | 2 +-
tests/auto/controls/data/tst_tabview.qml | 16 +++----
tests/auto/controls/data/tst_textarea.qml | 6 +--
tests/auto/controls/data/tst_textfield.qml | 38 +++++++--------
tests/auto/controls/data/tst_toolbar.qml | 4 +-
tests/auto/controls/data/tst_toolbutton.qml | 6 +--
tests/manual/ApplicationWindow/main.qml | 2 +-
tests/manual/ContextMenu.qml | 2 +-
tests/manual/Layout.qml | 2 +-
tests/manual/StackView.qml | 2 +-
tests/manual/WindowContextMenu.qml | 2 +-
tests/manual/baselines/main.qml | 2 +-
tests/manual/combobox/main.qml | 2 +-
tests/manual/popupwindowkeyevents.qml | 2 +-
tests/manual/scrollview/main.qml | 2 +-
tests/manual/splitter.qml | 2 +-
tests/manual/stackview/ButtonMenu.qml | 2 +-
tests/manual/stackview/View.qml | 2 +-
tests/manual/stackview/main.qml | 2 +-
tests/manual/stretching.qml | 2 +-
tests/manual/stretchingcustom.qml | 2 +-
tests/manual/tableviewmodels/qml/main.qml | 2 +-
.../testbench/content/PropertyLayouts.qml | 2 +-
tests/manual/testbench/main.qml | 20 ++++----
185 files changed, 337 insertions(+), 337 deletions(-)
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index ecbbb75a1..7e95b80b1 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 08925f632..039e20dd8 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 b7e461881..64df4ebdb 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 0cb234c39..8d6b096e6 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 be334458d..5474f1ba7 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 ed237d82b..f78ab69f9 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 7250bb313..0ca8c7cf8 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 d93c74d3d..8707b6cc8 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 553187b62..40ea8c39c 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 89120094d..1a66afa58 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 4cfb56948..f7f541bc5 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 65dc99f51..4e2dbeb84 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 019d72061..efcec5ee9 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 91f1504d8..f69318001 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 c9bebccd3..3ffd45baa 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 0eeea03a2..c0e60d62e 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 c794f7dcc..4efea3cbb 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 3b0c84c6a..c44284df1 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 05e3b5b07..6bdaf7bc6 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 da96d09d6..dc8f245bc 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 619a0b801..1bc9a4b66 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 f3372ea0f..0c30d9e59 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 728342877..fa9225be5 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 25eb6dc50..e995579d1 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 afd7f3818..facb711c3 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 7249bd001..66b49345d 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 20c4e1e56..c130abe8f 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 5b3d31f64..9ed90fa54 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 4794c17fa..0505a0a60 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 10f4ac254..0f9b502fa 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 4a9547a75..1909e05c2 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 8bbc0b7e9..849315e97 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 754ff141a..ff608b473 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 1ad0af029..2262af72e 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 678426d54..dbbf26a91 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 0530cf6a4..ccbeb55b4 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 0bebd1eba..b96cd61d9 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 a54559386..bd30ad8e3 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 df5b60d2f..dbacbffa6 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 5d2822b93..e99db1692 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 2af7d23ce..29a40f3fb 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 01deac63e..6a001f140 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 420ef2be7..730e3448f 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 c72277d8f..b18ebee74 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 3dd70475d..ffea986c4 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 26ba41b0c..c52815861 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 5318105c7..dadff0494 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 e19189d0d..2f3d57532 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 af5870b03..be4791bb3 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 6a6b36c0b..03c3812ec 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 7d4ae4d3b..d0299a55a 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 f7e9bc7e9..2dcaa9e93 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 9a0c80a62..0891392d5 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 d935251b0..de988d406 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 45cce7c9e..af8d41b68 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 da8e1f97d..8ab758f58 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 d1391ea1a..0b1db87cf 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 de05faa5d..0a98beefb 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 c697decc7..0f242eb09 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 8e3e5efcb..073a2e3fc 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 11f3e15a5..c03d96d58 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 1d889b908..caa20abd5 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 8e7505198..78ea9b17c 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 94e862704..017795823 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 758b6be6c..dfb9b0322 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 31ea5073d..667841bb5 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 91fc94897..7ad5686f9 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 3e371c8d4..7dee691db 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 82ad4f1f7..7a89cefba 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 9e4f3ccc8..fc4dc6062 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 07e1031b9..5703d405d 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 003d964aa..6bb336636 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 b01940d11..facc82235 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 e52235edb..ef55fc174 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 75c9de8fd..129890249 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 6218ce9bf..7ef760e2d 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 90ffa76d3..4a0d5894c 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 633002a89..bab4d41bb 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 55d3b60e6..49e3cace8 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 8fd559f4c..ac919bbaf 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 d11baad56..e15856856 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 56f1f62e6..ba897bfbd 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 0c4ba0209..8b0198150 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 54ce05538..6a5d59248 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 bde5e3f49..9244c7d8a 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 814618de6..33cc6779b 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 201dafa94..46750c1a3 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 77de5e5ab..c7e85ff48 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 eac5405ff..e019bda44 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 cc5736b12..59fc78247 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 f81991afa..bafb567cf 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 b185c24c4..8f09cf3cf 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 a3da455e9..dd4ee3890 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 822650754..a8be977d8 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 49393d3f8..70ed7baca 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 e3d5d3ea9..90f9d4a31 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 f1dec7202..8bc466eaf 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 e19d5d18d..e7cd6adaf 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 5dda0375b..dc424673d 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 14e1323e9..c2de493c6 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 067771416..0771bdb92 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 767939b36..af5d7b0b6 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 2518ce95d..c8eccf3f1 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 932dbfe35..5fa46cc33 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 5daf8a08e..956989a31 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 a434beb2c..dcb824447 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 c369619e3..a1895224e 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 194411dbf..300edee06 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 0e75fddbb..8f79dd568 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 af7845190..6d2b14051 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 1c285de1c..b912f8060 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 c0dd6cbcd..97a575e7f 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 396718356..8be67bfae 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 d85e6eae3..9d5f29bd6 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 1c8b06b24..ea7080a25 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 5f343ff97..7578a73a0 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 9cd36cbb4..6cb0cfde6 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 61416ea1e..8264776dd 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 b7ac4ca7b..b5411f84c 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 cd2d26b07..286abfc3c 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 00dd99c01..bb9e5414f 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 23c523faa..55fa12f2f 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 b4cd13aa2..bffae603c 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 28b1198cf..878d57c3a 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 93536bfe1..923842fc4 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 b55a4c6c2..d785e09e5 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 7d055df3c..48eb95104 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 7709aea88..543b84bce 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 e5fd598e5..c21e54cee 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 cb81523d0..c98b359be 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 864270130..6cd63ec0b 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 e810bbc94..150b6ad7e 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 d38423a43..7783a8516 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 4124651d8..2d6ca0e5f 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 788b272f2..b3f1de106 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 42a51d57b..7fe8ed728 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 ae454a736..e74e8cbde 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 47e1c2186..91e8c2e5e 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 c949788b5..ef93d7bd5 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 ad06045e4..edc1f3082 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 dc52238be..dcc55fb20 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 721284cf9..8910a30eb 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 977527efa..720bc73cc 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 4a6e296c4..04ebb5d06 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 c53ae22c0..71bfc42ed 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 4c2c25cf0..3d1b69837 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 9f22300a3..410b7934b 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 6a6efcd49..97ee0c5b1 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 ed58a6858..22ea6fdd1 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 7184ddb53..98248ed90 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 5880e2102..385314bc5 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 f91363643..e56145668 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 40191db84..c2efffbe6 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 b5311b038..64436c463 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 eb2b47d42..7141e1dbd 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 5e13acddb..848be7258 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 23433db46..dc61dde0b 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 c86ba44ec..75b4ac242 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 eb622abfd..dad39301d 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 999f148a1..ae73504b5 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 73e1c8d2e..a9f07a8b7 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 a88b3c6ea..b76113555 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 7c3b335f6..b7de67ba5 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 3eced48cd..10b86959f 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 e7bd7d81d..d3bf65532 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 a4d61415f..ee953a49b 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 9ffa17765..698583c69 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 c4330da3f..6a59fd98d 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 28e4b06f1..ee518c14e 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 91cdba409..0f964cb27 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 5c22072b5..b95de4fa1 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 8b05721d5..83cd9d258 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 6edfdd683..4b7a36a32 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 55441c9a3..b9f1b36c2 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 8b521c961..8fd8c7f01 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 7c8b88916..61a8e97a3 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 aefcbc280..6e1450d0a 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 684e026af..119aed845 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 f5872a473..58816883e 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 f93bd7fa3..ca54005da 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 c8c5b73a5..fef2f6ba7 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 d06e87801..9b65ce737 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 9bc0a0b92..e5b6dda7c 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 31cb5d77f..daadf8d72 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 87f7a71be..65e663796 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});
--
GitLab