diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index ecbbb75a186e28a3e4e3669c34ff37bb9fd58de5..7e95b80b1ed37dcfac4c859b9fb8c3b8186976a4 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 08925f6323ab9fbd86c9d5340c7f509135c8a47e..039e20dd8f106376204921dfc3a1a1c01b7acc6b 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 b7e461881cb65da55b72f48ebce4b2422a8be10f..64df4ebdb37736a3a8395226ce348a6803f644c6 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 0cb234c39356e65ddd9bd178fc695db711404e31..8d6b096e6469d139a93e7bf8442813736061dfbb 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 be334458d8536f17cd5c8654cc02edf0c205a1f0..5474f1ba7ecebe713232fd373e67ca2f45e32d08 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 ed237d82b8baa5d78cb7d9c7a6ad972e1a3cef05..f78ab69f982a5186563545c0222bbc53ce98edec 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 7250bb3131b62c769d96eafa9fb26c72c22b96c2..0ca8c7cf8a40637d31f20d8c5606e3e29340b656 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 d93c74d3d1af2f0f04fb39d40c66c752ffaec626..8707b6cc868144e9452180cca97afd60c591ce22 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 553187b622543caa63d2c7545af74318295a9b56..40ea8c39c3310b89ee3ed6a4fce61195642eb9ce 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 89120094d24cb4975a46a96cb1474a939ddabc9d..1a66afa5874820b58a3f94c9be01260bcde8f69f 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 4cfb569487ab218363960fb08fd3d95f8d31edd7..f7f541bc573192d72d6421fd2aa4f16de329a5a6 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 65dc99f51c6c0259e8e9d7deef9cf08afdae3b4f..4e2dbeb84e8653578c7d98f638ada7e7428ede9b 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 019d7206184700f22916a9a0198cb030d62f1176..efcec5ee9d9b4a335e57c19315fc094a1ef1996e 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 91f1504d8b784d47986fa74a9544ff547cb6f32a..f693180012b88e8651ebba973c9a81b7130003d0 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 c9bebccd32ae044918446f76fe12ce34f0cb94f1..3ffd45baac57128707eb2062e08416b872eb064c 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 0eeea03a2fb6f6ff1ae771b607375266766d4d71..c0e60d62e4d888fdcee7f28e4ea989a90f41a6cc 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 c794f7dcc8a1faa54f8b2032779e7a736f61dd99..4efea3cbb71a0ad3fa99cb03b3b549d085857b61 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 3b0c84c6afbfef23b82b61c1c73009f2a691d556..c44284df14991d6defa6e154201c617cc4f787a4 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 05e3b5b072e4a418b8c5d41b11824c354ccc3ac0..6bdaf7bc631f728fc66bc9a1ef5a5ff7e0adac64 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 da96d09d6336ee82cd5174b001c2668151e5c593..dc8f245bcb2ce2dbbde73b76231380820e41815e 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 619a0b80135c75701db704fe98c062932ad85298..1bc9a4b66d3d11cfb87e2f92da4e9f2617df38ba 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 f3372ea0f83e72d55f8d505ee5de3b2b88b67691..0c30d9e59641c62c613395777f057925404881a5 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 728342877cfe62b4910d69cb1216b1e10b9dc37f..fa9225be5d7c306c405c63f9445771418773ca84 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 25eb6dc508054ebcd4156f63ed66432979a8835a..e995579d1400366019d2853cb6fe656c794d9ac6 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 afd7f381881d60c9af0f03043a0ed607593ebdb8..facb711c37b1488eef18d201c3f54819debb0b8a 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 7249bd001fcd760b160914424b62debc5aadc69a..66b49345dd1f7865e8af191af6af7aab9558581d 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 20c4e1e560de84397a61538c59d94b1acca2f3ee..c130abe8fd3f62545c01a555542a2be00bff1faa 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 5b3d31f64eb07f2b4f8e5139ab04b3224d5ed6d6..9ed90fa54abde0c4db9b50a8e88ecc474a7846d0 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 4794c17fadfbf9a304b407b2b650faf6a066f52f..0505a0a60e5a95bfa0af02961e96a2ef31966f08 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 10f4ac2546fe1270823c1f3e4942551e67da8013..0f9b502fa577ac4b615328b4fb64ac797f3703ee 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 4a9547a75656816e5dbcda5253608a67247f089e..1909e05c21f5e965d8c59cc037a0fc49e7878947 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 8bbc0b7e93f751a015acd5f4bfa8d72dc74e299f..849315e979c5bd105c4747edffb062faa788b188 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 754ff141a1e626646754f2c08275ff1392aa5ef7..ff608b4734cfec806e94e0a7ac69ab2e950361b5 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 1ad0af0298b225a3284a883ef254f09dbd102d9c..2262af72e724597b46df23887b8abd09fe52f473 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 678426d54c79343ff3f458749671ebce800c6671..dbbf26a918baae637b4ffd382734cafb546c5b9c 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 0530cf6a4d6be76d7b7b956b95660cc5668e8957..ccbeb55b4fd2f1e2acd76442648153c3900b1e1a 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 0bebd1ebaf6eb965107d631c12ad1bc200d2a88c..b96cd61d9b568f7688158a87398654ace2e79c81 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 a54559386f6af984a2351623f973d0a5e017a536..bd30ad8e3d4bf737e69c52f87afceb8f7e757ce2 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 df5b60d2f435b7faaf7c0f865c7c9a8d4599c827..dbacbffa614495c851b043c5d675d20cbd62e065 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 5d2822b93e9183938807b4491b0f02ae528e894b..e99db1692ab1f4ff4021875cc738df58ec8c400a 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 2af7d23ce9567ec45def4aebbb25f52c302e22dc..29a40f3fbfe3333949ae915ed181073f1ab0eede 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 01deac63ea549854129f5621b968b15965bc6704..6a001f140db417b8403a72bb2954fb94353c9855 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 420ef2be7d9c7281707d7874d458e70981346a93..730e3448ffa4db4afe9d516f4892c0213cfccc61 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 c72277d8fa47df238357504e1b6e1b9b2978f955..b18ebee74c2fb384c50dcb580fa2bd0de9f591f0 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 3dd70475d298b5b1e70d427bcef41153132e78d6..ffea986c47170eaae011a26f618d678e7a518c93 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 26ba41b0cbda206ac1fa727aad06b996f1975131..c528158617fd2e23553e0acb895d3a78915801d5 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 5318105c7ea8b623cc502726ef50facd5396f3ce..dadff049432f23d6c77133bbc924b56773b4057e 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 e19189d0da8d37d6817d2a2fd0abd162e02d3ec6..2f3d57532ddec76941bbc0da2c29d3dfbd8a2cf5 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 af5870b032a32e77b2d10626b8efaa14218c8206..be4791bb3338a87336be0a47c5832ffb65a35fe4 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 6a6b36c0b020b4b3b3a68b45d897514e165eafe2..03c3812ecbdeea8ed9059f586430f9feab43ac42 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 7d4ae4d3b85292508165067495e61a5688edb8cd..d0299a55a781656fbb53526f7ec0b8578ae44b93 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 f7e9bc7e93cef35d3fb15020bc85204904262140..2dcaa9e938014f613efb7504f5f66aa7acbfa301 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 9a0c80a62459f75f89e098b4bafdd2e434ddb20d..0891392d581dbb4bf305e748bdc41ab361522d6b 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 d935251b0a15c05a51b2a00fe1781b2b42dc93d8..de988d40653b3a02d2616a9d8bc3ef9dd992967b 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 45cce7c9ecf07b61af2af66cb4011ab387ad8407..af8d41b68b0f1dbafbf10f671e464252f9c72691 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 da8e1f97dd86d11739a3cb75c08b05ecd991e3ab..8ab758f58a2d5991de987112f319b1dbc6555715 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 d1391ea1a0e0af6c6e3fea74fa8e4787885319fc..0b1db87cf715a76a25ede698ae61a67ef3758579 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 de05faa5d34ab72002737675b678b1fe9d29256f..0a98beefb39af902f4a3a98bbf5dc440243aa379 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 c697decc7c3cb59ca03c3cda2f2dcd7a7f8aa208..0f242eb09fb6d2e5deb7bbd855a20de8c1721216 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 8e3e5efcb227ab0f22104e575161219a9347d2c3..073a2e3fc88481232dea496d6ac7ae0b5d4f7a44 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 11f3e15a5a362dbfb3aea3041b87048f97de8912..c03d96d58193cb571f6e900a08538964aa2f648f 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 1d889b908178b2424f39dcd4c39fc78b7a3e42d2..caa20abd55fce5c3604df08cda08307904090984 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 8e750519858e6679a7b8061570fe9332aca57e1f..78ea9b17c3431ce5561a201d974415ec8e41df48 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 94e86270419492199ba8832d91eb90cd95ee1a94..017795823343d0551a959f7e9fde938cfed1abe1 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 758b6be6cdb0ed01c28587b8d4c95ba54026647f..dfb9b03228aeb7aac640d20c0b6d15f37a70a2dc 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 31ea5073dbbd05747ef7d1230115ed3dc5ccabac..667841bb549525c19212984d0476fc215d334f6b 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 91fc9489772671654b04513084c061b3c0b22d2c..7ad5686f9bd0842ce34f9d40f86b12bbc36b4d40 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 3e371c8d401ee99f54d9f75b95dfc274653f5771..7dee691db9fe36576a8c3d49a33aa657c5a35330 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 82ad4f1f7c9fc62f82c20e71e246829c76dba22d..7a89cefbae6c4a009f49a2863d736390f21c38ff 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 9e4f3ccc88c9cf58563db06deff8d8de8536e338..fc4dc60624c987833ef01cf02124f146c09c40b7 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 07e1031b972f6ae11e3046a7156ba4ff4ce042d3..5703d405d61d48ef116d31c71776c067c351892a 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 003d964aaf7fd2d8202b6514c2e2aed645cd81bc..6bb3366365d0f7026b1c8f8bc71ad849a3f46b26 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 b01940d111e9eacaa6f645af09720c5b455b8271..facc822351bd91644df1a0a4a2f68626871688af 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 e52235edb262fdb7c09808e54cdec4cfb68dbcea..ef55fc174e08df0a204f31d96c5c0e190b4c5186 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 75c9de8fd87f493aa891c15123054c052a001bd0..12989024988a36ba4ad40bae348d4aa60af9a001 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 6218ce9bfdb6340372ea0de0856a97e6bf9e04ae..7ef760e2d9fcecad8b3b1a0c876254cb30a3d9d4 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 90ffa76d35cdba61d33babd3c41beb82205bd99a..4a0d5894c536cdeb998559bf3c6d691d4a941ec1 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 633002a891d8b6328ea812435fea5b43d1655f6b..bab4d41bb00a61d56064ba70981ca5a89ea235d4 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 55d3b60e606e70828b4f3a360eaf6c67da4e5858..49e3cace8e15bd093275dddb0cfb2bd4fc62db19 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 8fd559f4c288306164e4f6050e5fbc83911a7c43..ac919bbaf3617a2588b7696569f7d42f651c916a 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 d11baad56656938fa9f783b626cddf3d6094d934..e158568561b6830698bd9831b0c617960cb22917 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 56f1f62e6447633312bfa45467c1b60ac526aa2c..ba897bfbdbe58435f48d8efd2b373f48d2e37f22 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 0c4ba0209dbf1dbebd1b22829a2e9bd9299cdb29..8b019815031c88ca39ade3c3d47e76e6e1f820dc 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 54ce055387b252a077c1d8bbb93333cc60d9db10..6a5d59248ba37dc1a4cccf3cffb49d46b251c6b2 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 bde5e3f4996bfc3b1b1348498bbf0dc5e2ca0319..9244c7d8a66079ca59412a0db2801b3536ade76b 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 814618de6ad3ccbb3ef128d37b4ea066ac6ae4dc..33cc6779bd29dba87847278db96fb5c001e02d3c 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 201dafa94fd1a8960559324a36021eb4dec36c16..46750c1a302cebca8484bc20538ebcc050bfb63c 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 77de5e5ab4aa04061d8fd3d5af7fe8b0d1ddce6a..c7e85ff48b4c3b75aece1c3459a8a893be161d70 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 eac5405ffb15f340f920205472e59a72cbbe6207..e019bda4415a26baea84025ee87d5f9b64d84895 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 cc5736b12b2edc852cd0d50a13831219225b7332..59fc78247016b10a52395d2459096e87ef2c43b3 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 f81991afad2e9860a28bc4339a57dc59f52d4502..bafb567cfc522b435a952406c0847bfcd9f93655 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 b185c24c4427580c03d736a8b833aa1190ceba3d..8f09cf3cf855eba84ad1f0e8488f53e70c82f623 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 a3da455e9a46622ea896b138e7d38522dc136a04..dd4ee3890b2c2c6f485e16c7f954b9f10113e42b 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 822650754747bcef2449b73208cd21adfeb76d8a..a8be977d8bfeaa8541e859b9c2507da27aa5b6ee 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 49393d3f8a426049c52c97e6e78107f814263891..70ed7baca486a729bfd81b2b5561a21db9fba8d4 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 e3d5d3ea97eaec0213ca38997fdfe32057213579..90f9d4a3147fc8d9fa82f6ed5256432d44f7bae3 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 f1dec7202b32d6d5fcedce80efb44e210b864dfe..8bc466eafbbe3521c2f1eed9d81f37b759a1e397 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 e19d5d18de6dbcb56f5652ab4e1a419cf1c5cac7..e7cd6adaf8e16e2e6ac1a892e4f65584f6ba73f6 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 5dda0375b5ffb5e5b3adc61c699d6a72b9d13cb3..dc424673d16da85144a300005a407abfb9d5fdd6 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 14e1323e934eea6587b9ba9afded37523091654b..c2de493c680c019e1fa50ab3f38814f16ed0e347 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 0677714162b13edddb473794481ebedaf227d507..0771bdb926dd4e5e85b4cfdda48a44bdafcd3795 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 767939b3677e5e84dce3e52e5260cfbbae33fe95..af5d7b0b664e49e0c1261f408fee597be4fb8141 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 2518ce95d04adb6d7cb4e900cdd54bdfa65e242e..c8eccf3f1456656f385e6b20557cea277f9044dd 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 932dbfe3500c1887a510ee1497e6754a3696816e..5fa46cc33b87e30bb87edf4055719cd39ae9d660 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 5daf8a08ef06298d776879ba2f4511d117e00c29..956989a31d388d296b7447b5b8e85c831d6f89aa 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 a434beb2c62b5ac2765fe4978921c11fc2135a41..dcb8244473141a3eece918e74d2270599911e6dc 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 c369619e3302e94d72a19085261863edf621bb0b..a1895224e00a0b29818d519a332e787c5cfa8076 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 194411dbfc0ce4f89fa264d906d9f4b9ba79e800..300edee0685fe49de708885eb0380f35cc0e2c09 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 0e75fddbb0a5f8facdd117a4c2a3d82f2d4d8bb2..8f79dd568c8d5aa29b5e22bfe0bf6d688ab7df07 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 af7845190749b470bf329b8faeebb40422592c2e..6d2b140519772f756660d5dd314cbe79a0bd9d91 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 1c285de1c691a34d9c25cde50ddab75acb5d0f43..b912f80602d1439966782d9d0f44ef6da6a84cfa 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 c0dd6cbcd07c72417908d6b7204d7c53fff8c3fd..97a575e7fdf039fcfd6a288b3c855372117fa648 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 396718356bda73220338d4a2fbdaa77e58122b10..8be67bfaee123dbe096d298ae67940a364032d6d 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 d85e6eae3355c6a222db25e8d142690ad9f3dd7e..9d5f29bd641d73bb927eced0a772e079233105e6 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 1c8b06b24741579dfbd705f5beaf966f40373c29..ea7080a2599ca789194413f11cee347c2834f42f 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 5f343ff970c3ef592f336d4e4f0b3c964abeb9d7..7578a73a0b25b95388c6c9c5d548758bef2fa2ff 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 9cd36cbb4849445278136d091999d85a641b3d4f..6cb0cfde6fc50000226df51948b15aad052b5341 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 61416ea1e50ff7c2632377b9a761131c0d35cc91..8264776dde5bc922fc016309121c638fb211e4f6 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 b7ac4ca7bb167fcc99acc7ea12849a53b4b73906..b5411f84c787f1c6e7495892f5135335be186db1 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 cd2d26b077b73fd719707608c8b02e3b5f7d9d4c..286abfc3c937d9df9c6564e7522b6221d3b8124b 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 00dd99c01a411688d0d1eb9410f5665ee7388de3..bb9e5414f0beb1537203d049ced88402141c7371 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 23c523faa6b5b3e4f0219615351649f7414ce739..55fa12f2fc9e0fe74acf3db88ae2bc903601ef8a 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 b4cd13aa289e53322fe1e701fae3ee84f8974901..bffae603c16196ba38e1554ae93dc64d54e9727b 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 28b1198cf932a4203ed7b2cf222cc0665d1b2688..878d57c3af2ec022cd00b8cea09040016b62a9b6 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 93536bfe14fe7475101fc2f5a6af8a900616ccb9..923842fc45dd9103a9185b08c3333c983be10f5c 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 b55a4c6c21348cab850df2afd7f8ebdff9f50c51..d785e09e58f09d5f778461dd24588deba46f8f41 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 7d055df3cd5feed4863e64e4b6e0d0c089394e32..48eb95104d9376608bf4009e73ce578225d2374d 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 7709aea8832b60d30dfaa7ef2a4434e7d094156b..543b84bce52835b5a6de8a17927feacdb1a6ddc8 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 e5fd598e57479f106abe53eed9c69cfb328bec16..c21e54cee1bac5d7ccb8b4184e63786932b05f06 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 cb81523d09ccc481b679ee02b7ae95a8072a7e33..c98b359be69fe95c1dd871524406f8533d45d9ea 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 8642701301b18ae41cb15a558518b98f558180e2..6cd63ec0bcd7d1f1921cda4a832af392b266564b 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 e810bbc94dbb2f028d8102df51b9261a8f937196..150b6ad7ed7aaf43657d09dc2315f3832e5f93bb 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 d38423a430092b61130a39635689d8168a01f335..7783a8516995193eb52c6921229e659adc75de5f 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 4124651d88a7c74d4c49b64aea7fd961789eaea1..2d6ca0e5f22aaf9816d6e10baaf09005ff3b3417 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 788b272f208a4672bb408af9aa6978e634693344..b3f1de10611c023d36e15e9380e8a802e7263b99 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 42a51d57bbce4aa022640e50e63b1930f98555b8..7fe8ed72875287e96d673a5e908820d1c5167822 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 ae454a736849968e141d438cee7f32768d7b8d58..e74e8cbde21ff4d41bbefb83a2438bae1cd71643 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 47e1c21869883a90ae88c1f51a71236691359d22..91e8c2e5e78b4c3bdae9bbbdcc347e05c359de66 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 c949788b54bd6d71fd63457ea6a44ad79f15c6d0..ef93d7bd51b459bef31066458dd5b2f626124ab4 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 ad06045e4642f9319143e477011e105c81458730..edc1f3082e820dad50e527eb8eb636d35f584886 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 dc52238be3b77a6080509a5a0ba26176a4cfb641..dcc55fb20ab135aa327638e25a6537a04a855fc0 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 721284cf9387002678f242fecc966268a5b28e85..8910a30eb2db738c5bebbce621a64bed1c156151 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 977527efa491ee706077c9b0d2873bb52b8251f1..720bc73cc7db1484bf7dbf0340199da49ed07fa2 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 4a6e296c427420c26b8e5233b9fc3ac4d0e2cb4e..04ebb5d06620eabf0ada5b0fb3614a699c161756 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 c53ae22c04917c869c58dc4720de4f5f4893cb84..71bfc42ed86606b2c3cf3dc5062a32821471ffd3 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 4c2c25cf03215638fb98eae1589f2e42297a4435..3d1b698373449803059a69f56bb0af26d8cf450b 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 9f22300a3b5f36a06bd8bd7d82a1a9e12c7dafdf..410b7934b89ebe68c3307dbc31a445a774423eec 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 6a6efcd497b26b4f680b6029d88e2c19cae0db01..97ee0c5b1700aa61f1afa729b1a531fa584456fd 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 ed58a6858e55109f546f1375e0c8b70981ad1301..22ea6fdd133c2208e5b5cada86caed8d928d5105 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 7184ddb53fab22cecab17b71338a966954cb9bc1..98248ed90066ba7f5fcf977bb53309a566d7d432 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 5880e210228d91f142d6cad84766c815dd310fa4..385314bc5911f70967d9441572d535491abcb869 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 f913636437ceeb94f1ad6d3e6f6cc5cd1dbd9118..e5614566861a08b84080f700aaee6f4533e539c3 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 40191db8469998fb4bd7787891879dab10a96fe2..c2efffbe66a3411e2aa91f6bd9b1f94b44314de3 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 b5311b038beeda2d39ca61b4ff604bbfd7b2fbf6..64436c46309f84f6ad8c834af26c76ab2a6b3fdb 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 eb2b47d42639db618377a0b1d791ba8aedcb6391..7141e1dbda4fd521da94899e714c9475afdf0316 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 5e13acddb175709118a28ecf3cbf155d280a890d..848be7258df1f8feb78f8fc92519b194b66f1658 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 23433db460cbda90a8151bf638152ca075c96e71..dc61dde0b990cb954ae60cba26e12017bffc847b 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 c86ba44ec7acbfbe08bccbb1b972fbcfee835be6..75b4ac2420aa948b455608fb1d8539c80e82b09f 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 eb622abfdf50e45ad4b1fc9ee80ebef16d875c63..dad39301da3e0ae677559a98364b8a251c17cbf1 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 999f148a19cf84cfb8c1cfe66ae70ac6630047d7..ae73504b54eb6663d44f2ad755ef62adb2216772 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 73e1c8d2ec29d3a00650e9e56acc446eda467688..a9f07a8b7330907579f50633adf24f166cfe544d 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 a88b3c6ea2a4eec81d342f984325c1a8fb3e210f..b76113555454efc296f11f39416f974fe13c36fc 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 7c3b335f6eaeb89235f3262751a07687d84311e3..b7de67ba5f7b7e86d6918e1897558d11a9693468 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 3eced48cd2b1ed06edace9d676a79fdd93250d0e..10b86959f2f6b6fba4ba0ca2aa6ccccfa28768ad 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 e7bd7d81de75f85777f7f61c619a189d931c5f56..d3bf65532a2c528f905b67a4ced37a5b546b0366 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 a4d61415f2bf46250e7020dc3501f2d98e59b0e5..ee953a49b650da053215152619103270e5d0d29e 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 9ffa17765658b5d318cde1f4fa724a9f6246b8d0..698583c69898bf6685a7ba8c304f6466e2fb2069 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 c4330da3f0a04c2a4450428b566ebeff3340ba2f..6a59fd98d7f41bd367d343070fc4b5cbf856c020 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 28e4b06f10b22222eae02bfa77d936b650efe9bf..ee518c14ef5e6fa694e247db2dfa97f137c38a4e 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 91cdba4092291d959a26257094157e2b03b1bca6..0f964cb27b0311bfb1da7b4ff859a004b580b897 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 5c22072b505a900652a72f1922113eda94a0d985..b95de4fa1a61fe05ce440865e9b220862f709c57 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 8b05721d5748c9a684f0c056dd4c1e9b3cf2f1d3..83cd9d2583e0dcb4e8bfad39edf05df8560ee378 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 6edfdd683458f15a025a9709fef4ae8705a7564e..4b7a36a323d349feac5252e8e1f61038e3791df0 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 55441c9a333790f26b503b68ae6ed6412d6f47b0..b9f1b36c2e3c44c75f57a2fccdda745d3c4bee5c 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 8b521c9617eb0d97d0163b347d8051672263af91..8fd8c7f01ce2946ef18fc1b9df44493f3b8feaff 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 7c8b889169f230a4ec7096938f3f32fa553a62ee..61a8e97a3167f98759ed4c69b508bb7b7418168a 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 aefcbc280326a36e75f02dd5e9868f2ecc0aac68..6e1450d0a213b7dfe22c06b121b20c513889b482 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 684e026af78bedc8191c1eff38bdf11c0a1e20fe..119aed845df79114d9633f78062624eff82e5c50 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 f5872a47327afa23ee14bfef76176d8e6ba1c143..58816883ed9eda395cede06c80b633ab908feec1 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 f93bd7fa38f9069aa3b5ccf2182933002cb21b62..ca54005daa01e63f20c7d8ea6e8764fd3784cd78 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 c8c5b73a5d9b28fd4c4c3ec4fd3f118cefb0e5ae..fef2f6ba77468bf973804f13e1006a34b2aaf52f 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 d06e878017356bcf5e33ad24b45d9a1ab0c879c5..9b65ce7379c2e633994b8c9ea7f5ac56019184c0 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 9bc0a0b92b5423b8615510f437c15b593629837b..e5b6dda7ca1526adeb9fd57660ebe64bce6ec12c 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 31cb5d77f18368e2757817088aa3398d45b564d0..daadf8d722e2197755425b25c4fa586a73bc065f 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 87f7a71beac6537eb430f8dc49e2ffbda428f4c7..65e663796020590d3ef818af079a3d3074fa723c 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});