diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index e43f0a4a4a494e4115b5e9822ae359654eef3c0e..fe573aa6c98bcb6ed6cab041ba268926e2806201 100644
--- a/examples/quick/controls/basiclayouts/main.qml
+++ b/examples/quick/controls/basiclayouts/main.qml
@@ -43,7 +43,7 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 5473e834ec4094ce209934d6ba5e0d3895986bef..21f2489a8b7d066c803304ba413a74d072201ed4 100644
--- a/examples/quick/controls/gallery/content/ChildWindow.qml
+++ b/examples/quick/controls/gallery/content/ChildWindow.qml
@@ -44,7 +44,7 @@
import QtQuick 2.1
import QtQuick.Window 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Window {
id: window1
diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml
index 946dd374b09bb25d1c2ba3a5bb1d24ce39fdc897..0ad754e1ae07343c3a26d3061c78c8a48b78e35b 100644
--- a/examples/quick/controls/gallery/content/Controls.qml
+++ b/examples/quick/controls/gallery/content/Controls.qml
@@ -44,7 +44,7 @@
import QtQuick 2.1
import QtQuick.Controls 1.1
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
Item {
id: flickable
diff --git a/examples/quick/controls/gallery/content/Layouts.qml b/examples/quick/controls/gallery/content/Layouts.qml
index ac0a53a33dbb8d4440621e63645a8d94313fc8fc..db9ae0f0893d02644fe67edd46bb8b1becc83625 100644
--- a/examples/quick/controls/gallery/content/Layouts.qml
+++ b/examples/quick/controls/gallery/content/Layouts.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 483d99ee49b2e67a219414c0565fc87093790f46..e733793bd46064286e8449bc34d9a49b4e491e08 100644
--- a/examples/quick/controls/gallery/content/ModelView.qml
+++ b/examples/quick/controls/gallery/content/ModelView.qml
@@ -43,7 +43,7 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
//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 e46a9ea0ff482e63adc2a57b1982caff91f42081..e774ab52b2c8b0b9665cdefe07a9f1b852a43e22 100644
--- a/examples/quick/controls/gallery/content/Styles.qml
+++ b/examples/quick/controls/gallery/content/Styles.qml
@@ -43,8 +43,8 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Particles 2.0
import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/splitview/main.qml b/examples/quick/controls/splitview/main.qml
index 4fa8504ab65c3fcab0eb9de471a76a0fc18d236a..992607d622d04767791f7750c03c72081ee6f344 100644
--- a/examples/quick/controls/splitview/main.qml
+++ b/examples/quick/controls/splitview/main.qml
@@ -43,7 +43,7 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/examples/quick/controls/tableview/main.qml b/examples/quick/controls/tableview/main.qml
index 1a9246f839b9f502d33a3507a6096150baaa4903..0897620105c513942107819793aeeff5d64cc666 100644
--- a/examples/quick/controls/tableview/main.qml
+++ b/examples/quick/controls/tableview/main.qml
@@ -44,7 +44,7 @@
import QtQuick 2.1
import QtQuick.Window 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 0d7ede255860be3df40b33765ea2b944f82398d4..14bfa6234d79ad4bc3acc9a56a2d08d11066a2f2 100644
--- a/examples/quick/controls/texteditor/qml/main.qml
+++ b/examples/quick/controls/texteditor/qml/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import QtQuick.Window 2.1
diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml
index f431a52e89addef25517e35cb870203b5e9237cc..95b99a83cea2482eb94c97e0a4bf46719e69dd54 100644
--- a/examples/quick/controls/touch/content/ButtonPage.qml
+++ b/examples/quick/controls/touch/content/ButtonPage.qml
@@ -43,8 +43,8 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Item {
width: parent.width
diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quick/controls/touch/content/ProgressBarPage.qml
index dc0f5521a034f639375eecb581efb55bc1b9339f..53882897f80bf5ea721e1a3cff6c9765a0f18d41 100644
--- a/examples/quick/controls/touch/content/ProgressBarPage.qml
+++ b/examples/quick/controls/touch/content/ProgressBarPage.qml
@@ -43,8 +43,8 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Item {
width: parent.width
diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quick/controls/touch/content/SliderPage.qml
index 8eb9190268ea61bda41afaf0b23ef259b4aab6c0..719adf44087010dd1c04ce782ad91303a1b16882 100644
--- a/examples/quick/controls/touch/content/SliderPage.qml
+++ b/examples/quick/controls/touch/content/SliderPage.qml
@@ -43,8 +43,8 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Item {
width: parent.width
diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml
index 7651a3c1af4f613b0adaf9d6d5cb70a0c3b94f89..7070af47fcfbf18f567a5d20edf23e09daeff416 100644
--- a/examples/quick/controls/touch/content/TabBarPage.qml
+++ b/examples/quick/controls/touch/content/TabBarPage.qml
@@ -43,8 +43,8 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Item {
width: parent.width
diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quick/controls/touch/content/TextInputPage.qml
index 605afef2e6c34b7486111f6412957c365be338bf..ba9aa1d6f29aca26460d71dbd90ff62460f0cfe7 100644
--- a/examples/quick/controls/touch/content/TextInputPage.qml
+++ b/examples/quick/controls/touch/content/TextInputPage.qml
@@ -43,8 +43,8 @@
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Item {
width: parent.width
diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml
index 9f93cb783eff0f2ff30a9bee7cc92089f741f77e..04509803c4ee0db067070e1768c69eac0b555763 100644
--- a/examples/quick/controls/touch/main.qml
+++ b/examples/quick/controls/touch/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import "content"
ApplicationWindow {
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index 364b2b119d4a3fad2bb2183e4d7be93a5a23b74e..52acc3f873b08369cc9c6fb1bb2beea5d0fe38b0 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -40,14 +40,14 @@
import QtQuick.Window 2.1
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import QtQuick.Controls.Private 1.0
/*!
\qmltype ApplicationWindow
\since QtQuick.Controls 1.0
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\ingroup applicationwindow
\brief Provides a top-level application window.
diff --git a/src/controls/BusyIndicator.qml b/src/controls/BusyIndicator.qml
index bf8b09524297ec09fb42c3b19219bd793db2d3ca..0c9518e60c060408ecd81dcbb0117f0327495c3b 100644
--- a/src/controls/BusyIndicator.qml
+++ b/src/controls/BusyIndicator.qml
@@ -44,7 +44,7 @@ import QtQuick.Controls.Private 1.0
/*!
\qmltype BusyIndicator
- \inqmlmodule QtQuick.Controls 1.1
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.1
\ingroup controls
\brief A busy indicator.
diff --git a/src/controls/Button.qml b/src/controls/Button.qml
index f724e5af514f004673358f7ec0703fb64f398b38..b6611b9d68d1c34f3a9ab755f8f34fc46675a519 100644
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype Button
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief A push button with a text label.
diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml
index 48d5e8b2acd2273e9693e80c1b348abd8446c5e4..ab6b3da5c3281fecc026dd738a6023f439f16540 100644
--- a/src/controls/CheckBox.qml
+++ b/src/controls/CheckBox.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype CheckBox
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief A checkbox with a text label.
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index 75af9844d0d74f7e0d8978ab7ac0af716ece2165..4af49c1453443d929838da54b7f9f107270df736 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ComboBox
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief Provides a drop-down list functionality.
diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml
index b30c4f8f6b6c5478ff88d8976ee20ed64c8e7699..5d069f553afe1f62a751b71001d436888afefa78 100644
--- a/src/controls/GroupBox.qml
+++ b/src/controls/GroupBox.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
import QtQuick.Layouts 1.0
/*!
\qmltype GroupBox
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief GroupBox provides a group box frame with a title.
diff --git a/src/controls/Label.qml b/src/controls/Label.qml
index c4ce0ded81f65a2fb44afec0176b31f295a4770c..4d1ed087b56175883de0015b62a6bb649c913870 100644
--- a/src/controls/Label.qml
+++ b/src/controls/Label.qml
@@ -42,7 +42,7 @@ import QtQuick 2.1
/*!
\qmltype Label
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief A text label.
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml
index 61c9daa9241c7e442a03885105e5bb58f21e1bc4..1e230ea86f367e79e811ee7ef73fc2587596585a 100644
--- a/src/controls/Menu.qml
+++ b/src/controls/Menu.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype Menu
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup menus
\brief Provides a menu component for use in menu bars, as context menu,
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index 22124af84c3d9b046f183d8805d02098f317db06..85944d2396182ccf94742d84f5c352f63a4c689d 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype MenuBar
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup applicationwindow
\brief Provides a horizontal menu bar.
diff --git a/src/controls/Private/AbstractCheckable.qml b/src/controls/Private/AbstractCheckable.qml
index 02348b7173b58248094c7ca5199f737c59ca46e8..858569e8f5214f1794503203654f64a6a3f8cbb9 100644
--- a/src/controls/Private/AbstractCheckable.qml
+++ b/src/controls/Private/AbstractCheckable.qml
@@ -39,11 +39,11 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
/*!
\qmltype AbstractCheckable
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\ingroup controls
\brief An abstract representation of a checkable control with a label
\qmlabstract
diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml
index e48b1cda650f4c2d6d45f31895dcaa34a67e7462..e069e7c0b25c44d4c27a8ed5b53130c3aeea65f5 100644
--- a/src/controls/Private/BasicButton.qml
+++ b/src/controls/Private/BasicButton.qml
@@ -39,9 +39,9 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
/*!
\qmltype BasicButton
diff --git a/src/controls/Private/Control.qml b/src/controls/Private/Control.qml
index 05916c0a7df42e2b50496d08d418275fc0f1372a..6b9a44155a59d9c40f8dd876eacf59ac88b9b9ab 100644
--- a/src/controls/Private/Control.qml
+++ b/src/controls/Private/Control.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
/*!
\qmltype Control
diff --git a/src/controls/Private/FocusFrame.qml b/src/controls/Private/FocusFrame.qml
index 0bf9174a1e5b6a8d2b471cdb027296edfae6c2a6..c81ef11fb38a3a77c1eb28a16c2756e96e1bcf9e 100644
--- a/src/controls/Private/FocusFrame.qml
+++ b/src/controls/Private/FocusFrame.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml
index 110b8b2dcd8889ea5d38f1baf0cdc578fe94735e..9ee330d3821757562e52cd40a6eda3edf971e5f0 100644
--- a/src/controls/Private/ScrollBar.qml
+++ b/src/controls/Private/ScrollBar.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index ccad20b23b8b3eacfe5eea57dd6e88074396be3f..2037a16ffb6a64f23bfb261fb1750bfea58a214e 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
diff --git a/src/controls/Private/StackViewSlideDelegate.qml b/src/controls/Private/StackViewSlideDelegate.qml
index 6cc1c683482c24521a0f71ad9b178a5ce3555678..2d9a8c9a6fc0e01581daabff1ef415bf191f8857 100644
--- a/src/controls/Private/StackViewSlideDelegate.qml
+++ b/src/controls/Private/StackViewSlideDelegate.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
/*!
\qmltype StackViewSlideTransition
diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml
index 6b4c08ef7dd471880b4c5de459eb49c4137479bc..b06e0a3de58cbdaa1c6372f163bb607f66046a30 100644
--- a/src/controls/Private/Style.qml
+++ b/src/controls/Private/Style.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
diff --git a/src/controls/Private/TabBar.qml b/src/controls/Private/TabBar.qml
index 8341c92272bb264a88297842b25b6170b611a6ab..1edc5575e68d1067cdea76d98c58e21b1a548fb4 100644
--- a/src/controls/Private/TabBar.qml
+++ b/src/controls/Private/TabBar.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
/*!
\qmltype TabBar
diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml
index e472e66e0a44c3b43339706c177eeb5d61995994..0f127f15ed35540e484d69052c170264a841615c 100644
--- a/src/controls/ProgressBar.qml
+++ b/src/controls/ProgressBar.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ProgressBar
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief A progress indicator.
diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml
index fde08817b243677278f422644e22f5e39da17f55..addee3e18efafd5b0885a524b45a4e4fbd3f93e1 100644
--- a/src/controls/RadioButton.qml
+++ b/src/controls/RadioButton.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype RadioButton
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief A radio button with a text label.
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 7d3d1d9d600f7c078336e2cbad1d20aacdc57b78..5717d70fa04bbc88a7fa7614108e67d4726a219d 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
/*!
\qmltype ScrollView
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup views
\brief Provides a scrolling view within another Item.
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index 0755a81797dc0cd7b25f1deb378ad23fc6a7e761..7e01d5c7a3ff6175fd16def4e5bab21eab2270a3 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype Slider
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief Provides a vertical or horizontal slider control.
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index a952838c7bc35b5e9e166a1d635fa14ecfcb5bd2..473fe6db7018e4dbe0f1da87c9900199f72bf7d9 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype SpinBox
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief Provides a spin box control.
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml
index e8d6fc9a277f5eeeaca4e69fff238a70d8a1125b..a63a2d6f396d6a1ac864e9f60424e5009e03edee 100644
--- a/src/controls/SplitView.qml
+++ b/src/controls/SplitView.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import QtQuick.Controls.Private 1.0 as Private
/*!
\qmltype SplitView
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup views
\brief Lays out items with a draggable splitter between each item.
diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml
index 1f7eb1ab603658e1051dbfc75939f91f249383c5..d2af0d6cd2a043aa16b775bd877427389ae7f685 100644
--- a/src/controls/StackView.qml
+++ b/src/controls/StackView.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype StackView
\inherits Item
\ingroup views
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\brief Provides a stack-based navigation model.
diff --git a/src/controls/StackViewDelegate.qml b/src/controls/StackViewDelegate.qml
index 0e24996556112a8f00fb56527719162d1e5d16f5..a2490b1a651f55725fcb58c05438c444e3c9ae72 100644
--- a/src/controls/StackViewDelegate.qml
+++ b/src/controls/StackViewDelegate.qml
@@ -42,7 +42,7 @@ import QtQuick 2.1
/*!
\qmltype StackViewDelegate
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\brief A delegate used by StackView for loading transitions.
diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml
index 85cc6681c4adc82756bef68952a07e3bd791d319..303da7296dff00000764e7dbc33c44150d479e7a 100644
--- a/src/controls/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype StatusBar
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup applicationwindow
\brief Contains status information in your app.
@@ -59,7 +59,7 @@ import QtQuick.Controls.Private 1.0
Otherwise the height is platform dependent.
\code
- import QtQuick.Controls 1.0
+ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index aea5f721e38ac677def8a283098235554fdfe82c..768d5ab1d3eb10cca485f80a7870c63affa79bf6 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ButtonStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for Button
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml
index 18dfec6a4740478711624c46b56f2e69b31e0f2a..60cd788b5202ea2577d46d1d5cb0a8bcbbbd2a63 100644
--- a/src/controls/Styles/Base/CheckBoxStyle.qml
+++ b/src/controls/Styles/Base/CheckBoxStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype CheckBoxStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for CheckBox
diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index 7984a329f315d3e9a3a67901c526d5fe4cb68bdb..5a0ef93771848af85f8c290e749ae8228965d256 100644
--- a/src/controls/Styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ComboBoxStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for ComboBox
diff --git a/src/controls/Styles/Base/FocusFrameStyle.qml b/src/controls/Styles/Base/FocusFrameStyle.qml
index 6fd50e9af350b0bb9dc5bfc43e5b00d3fa8d488b..27edf11c5c561409808b0ffe1dd3812d807f14f8 100644
--- a/src/controls/Styles/Base/FocusFrameStyle.qml
+++ b/src/controls/Styles/Base/FocusFrameStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype FocusFrameStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Item {
property int margin: -3
diff --git a/src/controls/Styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml
index 1c3acadab6089dc1f0081d702e13499e55766c36..1debd94adffc0706e25974d0d5bdd7032be36fde 100644
--- a/src/controls/Styles/Base/GroupBoxStyle.qml
+++ b/src/controls/Styles/Base/GroupBoxStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype GroupBoxStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\ingroup controlsstyling
\since QtQuick.Controls.Styles 1.0
*/
diff --git a/src/controls/Styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml
index 895a6ef0b43a01d851042a1b23ed8f9171305efe..3a3b552dd66e9abf1e7b87747aa485a98a3f06f6 100644
--- a/src/controls/Styles/Base/MenuBarStyle.qml
+++ b/src/controls/Styles/Base/MenuBarStyle.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype MenuBarStyle
\internal
\ingroup applicationwindowstyling
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
diff --git a/src/controls/Styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml
index 4b2099f8e24d72d23c874cbde6d502c8f7bf07e4..9be32459c8113a529194e1fde9cdc063f8e55729 100644
--- a/src/controls/Styles/Base/MenuStyle.qml
+++ b/src/controls/Styles/Base/MenuStyle.qml
@@ -39,14 +39,14 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype MenuStyle
\internal
\ingroup menusstyling
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml
index ada97c101d18d10ad21f06f59d65b4e09de3a305..eac7826984457c16f98ab379bf7fd0524294b106 100644
--- a/src/controls/Styles/Base/ProgressBarStyle.qml
+++ b/src/controls/Styles/Base/ProgressBarStyle.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ProgressBarStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for ProgressBar
diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml
index bac69d05ef2affb6f2d1eabc409a28b810f77383..4e01a99351960d2d240706debbcca80d9663d4f7 100644
--- a/src/controls/Styles/Base/RadioButtonStyle.qml
+++ b/src/controls/Styles/Base/RadioButtonStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype RadioButtonStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for RadioButton
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
index e8df1a5500458982dcba535632e265f73cc79935..a5f4372a757213739d79eac6a8069726c59ed1d6 100644
--- a/src/controls/Styles/Base/ScrollViewStyle.qml
+++ b/src/controls/Styles/Base/ScrollViewStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ScrollViewStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup viewsstyling
\brief Provides custom styling for ScrollView
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index 0d341a739260701a2a91be610777885f61947346..8d22b935f8df8d9c611728d1df333405ac743efe 100644
--- a/src/controls/Styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype SliderStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for Slider
diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml
index 931db588bc685a46804295ee7ac3c0aee231b235..c1d137e1cd29209d0f5e38e89852cdbe6f3d5ec4 100644
--- a/src/controls/Styles/Base/SpinBoxStyle.qml
+++ b/src/controls/Styles/Base/SpinBoxStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype SpinBoxStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for SpinBox
diff --git a/src/controls/Styles/Base/StatusBarStyle.qml b/src/controls/Styles/Base/StatusBarStyle.qml
index f8ffffd900ed41e1fb0de56712bb30048a538066..578ac7fd3ce7e88fe7b06d2569ee325cb1f884dd 100644
--- a/src/controls/Styles/Base/StatusBarStyle.qml
+++ b/src/controls/Styles/Base/StatusBarStyle.qml
@@ -38,14 +38,14 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype StatusBarStyle
\internal
\ingroup applicationwindowstyling
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
*/
Style {
diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml
index d73d9bcb820e47ee420b033a89069b2e97e51532..92fd87fd54d3d086111293fff1f3bf4e51ac7d39 100644
--- a/src/controls/Styles/Base/TabViewStyle.qml
+++ b/src/controls/Styles/Base/TabViewStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype TabViewStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup viewsstyling
\brief Provides custom styling for TabView
diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml
index dd47f7cac0d5ef07ab522994805da20b1d61e676..bcc0a2fd0479b238936da24a3f6fa4ba1d22f8d4 100644
--- a/src/controls/Styles/Base/TableViewStyle.qml
+++ b/src/controls/Styles/Base/TableViewStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype TableViewStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup viewsstyling
\brief Provides custom styling for TableView
diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml
index 16d0fe94cdee083e47159e09c3009c43a642ddb7..bf4d533b70977c3475f2ece170465bed0998c829 100644
--- a/src/controls/Styles/Base/TextFieldStyle.qml
+++ b/src/controls/Styles/Base/TextFieldStyle.qml
@@ -38,12 +38,12 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype TextFieldStyle
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
\since QtQuick.Controls.Styles 1.0
\ingroup controlsstyling
\brief Provides custom styling for TextField.
diff --git a/src/controls/Styles/Base/ToolBarStyle.qml b/src/controls/Styles/Base/ToolBarStyle.qml
index a5c03e7a1b7d146ea4566517466a65efa8851a4b..51fe8ca74299ea6754111572c102a7e502201471 100644
--- a/src/controls/Styles/Base/ToolBarStyle.qml
+++ b/src/controls/Styles/Base/ToolBarStyle.qml
@@ -38,14 +38,14 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ToolBarStyle
\internal
\ingroup applicationwindowstyling
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
diff --git a/src/controls/Styles/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml
index 280740e4da42fe89c38de0340fba06a30b9ecdca..4db41a059fb61fbbdbc128c6a34bbe9114c954d5 100644
--- a/src/controls/Styles/Base/ToolButtonStyle.qml
+++ b/src/controls/Styles/Base/ToolButtonStyle.qml
@@ -38,14 +38,14 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ToolButtonStyle
\internal
\ingroup controlsstyling
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
readonly property ToolButton control: __control
diff --git a/src/controls/Styles/Desktop/ButtonStyle.qml b/src/controls/Styles/Desktop/ButtonStyle.qml
index 2385873e87bf3e53f858496c7eb24c0ec6cf0662..33e8f0eeda3b4c95af1eff47d7ef7b3006486777 100644
--- a/src/controls/Styles/Desktop/ButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ButtonStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml
index 6bbb5b1d539ab4911b58b9d166f289b2b569011d..2cc688a7c6b39d212a03abad5faa46b9cbffb7b7 100644
--- a/src/controls/Styles/Desktop/CheckBoxStyle.qml
+++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml
index 953976413af50d2cd076dd091ced16b36a70c20e..91a8e82c61562fe6943eaa241b9b8941f1a602e0 100644
--- a/src/controls/Styles/Desktop/ComboBoxStyle.qml
+++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/FocusFrameStyle.qml b/src/controls/Styles/Desktop/FocusFrameStyle.qml
index 420a0ab5bf7a6031381355d159c624c03638b16f..0bea860eee415e728775526401b79ea105667f5f 100644
--- a/src/controls/Styles/Desktop/FocusFrameStyle.qml
+++ b/src/controls/Styles/Desktop/FocusFrameStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype FocusFrameStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
StyleItem {
property int margin: -3
diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml
index 835dd7186ffddfc232f3f6b290a67d5bd60dfece..0be0a8d68df71b2b6e38ab02e795efece1e6160f 100644
--- a/src/controls/Styles/Desktop/GroupBoxStyle.qml
+++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/MenuBarStyle.qml b/src/controls/Styles/Desktop/MenuBarStyle.qml
index 291df0fbd0a17e51779d158d60cc4da7ca0fdd2b..41098972efbc118f4f4ad3318b21f2b60149bc15 100644
--- a/src/controls/Styles/Desktop/MenuBarStyle.qml
+++ b/src/controls/Styles/Desktop/MenuBarStyle.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml
index 960a163d237cbc40ec0002a6e357d198887a6aa8..2e3296b641fb5f3e1f9a4fa2feb656801c996412 100644
--- a/src/controls/Styles/Desktop/MenuStyle.qml
+++ b/src/controls/Styles/Desktop/MenuStyle.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ProgressBarStyle.qml b/src/controls/Styles/Desktop/ProgressBarStyle.qml
index 834b8ab3c4654c00018a7f4fef044473282734b3..70fa04024767ffbb8393457003b89bc3044d2f61 100644
--- a/src/controls/Styles/Desktop/ProgressBarStyle.qml
+++ b/src/controls/Styles/Desktop/ProgressBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml
index b41b959a2cb3adabf71a63805681737e21412f05..34d1efa8e01e62ba233b9238a157b3b02a7d8b97 100644
--- a/src/controls/Styles/Desktop/RadioButtonStyle.qml
+++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ScrollViewStyle.qml b/src/controls/Styles/Desktop/ScrollViewStyle.qml
index ff03b3c3b7a6b5429f6dcb47147a8f8c07fa1fc5..9342d5249e0ed194e2c49c785df42765b835094d 100644
--- a/src/controls/Styles/Desktop/ScrollViewStyle.qml
+++ b/src/controls/Styles/Desktop/ScrollViewStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/SliderStyle.qml b/src/controls/Styles/Desktop/SliderStyle.qml
index e435205ece2790ba0af846055a7f937e4c2daa68..fd426e35b7e7aad09d491f9895284d977ba27959 100644
--- a/src/controls/Styles/Desktop/SliderStyle.qml
+++ b/src/controls/Styles/Desktop/SliderStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml
index 24f51427cba87a465015403b8bee6764affa9d48..6fdd407e7e3f3be9943fa80e1bed95f4f41c1e37 100644
--- a/src/controls/Styles/Desktop/SpinBoxStyle.qml
+++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/StatusBarStyle.qml b/src/controls/Styles/Desktop/StatusBarStyle.qml
index 930ca773c17dd1018c35e8ffa50fab8ffb964555..cb3cde47bd812213935b233bed16a26d7dd969d6 100644
--- a/src/controls/Styles/Desktop/StatusBarStyle.qml
+++ b/src/controls/Styles/Desktop/StatusBarStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype StatusBarStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
diff --git a/src/controls/Styles/Desktop/TabViewStyle.qml b/src/controls/Styles/Desktop/TabViewStyle.qml
index 51b70ea4dd62292032876cf3b3ce389d2973ce57..01851711b53bc1891ece60343f08ff0b48f2a6ca 100644
--- a/src/controls/Styles/Desktop/TabViewStyle.qml
+++ b/src/controls/Styles/Desktop/TabViewStyle.qml
@@ -38,9 +38,9 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
Style {
id: root
diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml
index 171678a3fa37b14e312f6622854141fedb6379df..d588202da4f25a4d91722cdb60fae51fca39de00 100644
--- a/src/controls/Styles/Desktop/TableViewStyle.qml
+++ b/src/controls/Styles/Desktop/TableViewStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
ScrollViewStyle {
diff --git a/src/controls/Styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml
index 53282887ac38c800b5bee8d99b24cbebd586b11b..10bcab68e1c5335ceda33c0eb03f72874fd715e8 100644
--- a/src/controls/Styles/Desktop/TextFieldStyle.qml
+++ b/src/controls/Styles/Desktop/TextFieldStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ToolBarStyle.qml b/src/controls/Styles/Desktop/ToolBarStyle.qml
index c295f7310275fd1c4cc253fb6948e1a884773889..48825fc77e63379e47fed285f42de220a89800b3 100644
--- a/src/controls/Styles/Desktop/ToolBarStyle.qml
+++ b/src/controls/Styles/Desktop/ToolBarStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype StatusBarStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
diff --git a/src/controls/Styles/Desktop/ToolButtonStyle.qml b/src/controls/Styles/Desktop/ToolButtonStyle.qml
index 25529f11d8e3b8948badb8cc8ebae17bb650e7a8..464210d805c3ac264b6a1e06cfd39146963d89bf 100644
--- a/src/controls/Styles/Desktop/ToolButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ToolButtonStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Tab.qml b/src/controls/Tab.qml
index 0cf2634109ff4350eaa82d9ea43f86859b097caa..88fd83494498b2e065fa9752b97076a2d8d780e6 100644
--- a/src/controls/Tab.qml
+++ b/src/controls/Tab.qml
@@ -42,7 +42,7 @@ import QtQuick 2.1
/*!
\qmltype Tab
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup viewaddons
\brief Tab represents the content of a tab in a TabView.
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index 6319d72cd712fcc2ac077776ca6c3a4c948d7ef6..e8dd9be8aec439301b20059ba26c470914c575f3 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype TabView
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup views
\brief A control that allows the user to select one of multiple stacked items.
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 68bd442487bc87eeaed82235c01397c2da60592f..9a53e019df2602154a161b7e1476c10774f87b2b 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -39,13 +39,13 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
/*!
\qmltype TableView
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup views
\brief Provides a list view with scroll bars, styling and header sections.
diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml
index f2e16ac038c644536e3e1c42fdd80aa5c34d8c79..81833c0217b0437a7b1113371e267e16e665378a 100644
--- a/src/controls/TableViewColumn.qml
+++ b/src/controls/TableViewColumn.qml
@@ -42,7 +42,7 @@ import QtQuick 2.1
/*!
\qmltype TableViewColumn
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup viewitems
\brief Used to define columns in a \l TableView.
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index 31762d20c2432e1488cd96550193ccc299dd3150..bf2b1c7939cada78ce1d318356cde95c0a9d4876 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -39,11 +39,11 @@
****************************************************************************/
import QtQuick 2.2
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype TextArea
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief Displays multiple lines of editable formatted text.
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index 1648ac57a466f465923053b65d4eab325002745f..a48671302d7d25204d46e0c3084b32aa863d3ebf 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype TextField
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief Displays a single line of editable plain text.
@@ -380,7 +380,7 @@ Control {
\code
import QtQuick 2.1
- import QtQuick.Controls 1.0
+ import QtQuick.Controls 1.1
TextField {
validator: IntValidator {bottom: 11; top: 31;}
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index 093df2e6a35345122e0045cda872eec3aab49de7..379b82e36f80c22c690f92dc475ae48e2db077ff 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ToolBar
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup applicationwindow
\brief Contains ToolButton and related controls.
@@ -61,7 +61,7 @@ import QtQuick.Controls.Private 1.0
Otherwise the height is platform dependent.
\code
- import QtQuick.Controls 1.0
+ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index 7f5fcb7afa57da6abc7548a05c01f8fa1bc052f0..410fa0279b986d900b22d81a712a9983c1a85554 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -39,12 +39,12 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype ToolButton
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\since QtQuick.Controls 1.0
\ingroup controls
\brief Provides a button type that is typically used within a ToolBar.
diff --git a/src/controls/doc/src/qtquickcontrols-overview.qdoc b/src/controls/doc/src/qtquickcontrols-overview.qdoc
index 4eb6892fe129e8f6ec312408945b20853876e968..5dda0375b5ffb5e5b3adc61c699d6a72b9d13cb3 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.0
+ import QtQuick.Controls 1.1
\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.0
+ import QtQuick.Controls 1.1
ApplicationWindow {
title: "My Application"
diff --git a/src/controls/doc/src/qtquickcontrols.qdoc b/src/controls/doc/src/qtquickcontrols.qdoc
index 746d7873f3815c2f366b94b7776ba252feb32966..7b161bd1ace986ee162a1e88c5259bdce8cb4835 100644
--- a/src/controls/doc/src/qtquickcontrols.qdoc
+++ b/src/controls/doc/src/qtquickcontrols.qdoc
@@ -41,7 +41,7 @@
following import statement in your .qml file.
\code
- import QtQuick.Controls 1.0
+ import QtQuick.Controls 1.1
\endcode
*/
diff --git a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
index e035ddba98b972785c136fe17eb847fdb26a8cd0..15678329ba7319b254770f4a2dfcf0dbec59d265 100644
--- a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc
@@ -64,7 +64,7 @@
The QML types can be imported into your application using the following import statement in your \c {.qml} file.
\code
- import QtQuick.Controls.Styles 1.0
+ import QtQuick.Controls.Styles 1.1
\endcode
\section1 Styling Views
@@ -108,6 +108,6 @@
that can be replaced with custom QML snippets.
\code
- import QtQuick.Controls.Styles 1.0
+ import QtQuick.Controls.Styles 1.1
\endcode
*/
diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp
index aaae51c53b88a59e2ac1c60cb5871553010ff3e2..cfd0b4faf3f6c82a14c3304a576a74edef2f9f6a 100644
--- a/src/controls/qquickaction.cpp
+++ b/src/controls/qquickaction.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
\qmltype Action
\instantiates QQuickAction
\ingroup applicationwindow
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\brief Action provides an abstract user interface action that can be bound to items
In applications many common commands can be invoked via menus, toolbar buttons, and keyboard
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index f2823f16bc7d0e5f56080d879d254ad2c7eb0a92..b4ceb7308bd0bd4809c0fed68113c22bca1ee189 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
\qmltype MenuPrivate
\instantiates QQuickMenu
\internal
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
*/
/*!
diff --git a/src/controls/qquickmenubar.cpp b/src/controls/qquickmenubar.cpp
index e16cb8f055de9f6f8bfe5bdd7c140d0ded5bf04e..39235b472128f32c6f5f50cc5bcc1bcf890c01be 100644
--- a/src/controls/qquickmenubar.cpp
+++ b/src/controls/qquickmenubar.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
\qmltype MenuBarPrivate
\instantiates QQuickMenuBar
\internal
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
*/
/*!
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp
index 1834ffc15ea07db57ba62c1dac92ae1a3d51635d..a6325020f67eeb6b4e25755708fd38a8e30ba47a 100644
--- a/src/controls/qquickmenuitem.cpp
+++ b/src/controls/qquickmenuitem.cpp
@@ -126,7 +126,7 @@ void QQuickMenuBase::setVisualItem(QQuickItem *item)
/*!
\qmltype MenuSeparator
\instantiates QQuickMenuSeparator
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\ingroup menus
\brief MenuSeparator provides a separator for items inside a menu.
@@ -244,7 +244,7 @@ void QQuickMenuText::updateIcon()
\qmltype MenuItem
\instantiates QQuickMenuItem
\ingroup menus
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\brief MenuItem provides an item to add in a menu or a menu bar.
\code
diff --git a/src/controls/qquickstack.cpp b/src/controls/qquickstack.cpp
index c949ffebf449e5a1a2767b9708b84b271655e91f..b5fe033a8185fedb0830ee6a06149fe4947bc7dc 100644
--- a/src/controls/qquickstack.cpp
+++ b/src/controls/qquickstack.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype Stack
\instantiates QQuickStack
- \inqmlmodule QtQuick.Controls 1.0
+ \inqmlmodule QtQuick.Controls
\brief Provides attached properties for items pushed onto a StackView.
The Stack type provides attached properties for items pushed onto a \l StackView.
diff --git a/src/layouts/doc/src/snippets/windowconstraints.qml b/src/layouts/doc/src/snippets/windowconstraints.qml
index 673169a3a85f805d2b39b3f3b25d1798c4a8e1e6..d9411c334f8ccfd75b0429b10d4f8973dc54ab0f 100644
--- a/src/layouts/doc/src/snippets/windowconstraints.qml
+++ b/src/layouts/doc/src/snippets/windowconstraints.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml
index 20f1a77f4731eee629c92c45cc1caddd1315445c..210d377c7ade3070163544e1ddf44ee4fa0e006f 100644
--- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml
+++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Item {
id: main
diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml
index bd4c482625fae5cee1287ee25c7e0029c7ddc116..d4e813019865e9b9992942d24abca1fa9b4d9bd8 100644
--- a/tests/auto/applicationwindow/data/activefocusontab.qml
+++ b/tests/auto/applicationwindow/data/activefocusontab.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml
index e19648aed618623e68001c6abea799b7f0476220..71bf9983f3cd2ab1133172dfab83d3e4dc11db94 100644
--- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml
+++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml
@@ -39,7 +39,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
ApplicationWindow {
title: "Test Application Window"
diff --git a/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml b/tests/auto/controls/data/groupbox/gb_activeFocusOnTab.qml
index 6d1956fb55c8d70be4644a1651329398abc1340b..e3d69aa33c7b24494f5698a67a7cab53f306b856 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Column {
width: 200
diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml
index 2320e24083d316d4d9c1ddade3fc4d61332a9198..74f5a23bd60b5b451004e87b9301e2d525fa5d1f 100644
--- a/tests/auto/controls/data/rangemodel/rangemodel.qml
+++ b/tests/auto/controls/data/rangemodel/rangemodel.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 c9c6f5f57e39e16c5d20c92effaa6e8cb46d7a97..56096dee6bc09469239356dd098f0d1287591c76 100644
--- a/tests/auto/controls/data/shortcut/shortcuts.qml
+++ b/tests/auto/controls/data/shortcut/shortcuts.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Rectangle {
width: 300
diff --git a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml
index f058de00cfa59389445eda34f944569ecf72bea2..1244b40524aeefe016c48f926b451a2d1c421d75 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 514a57c821af48f65d09de5ba9f3906973831506..eda5ee7212519c9277c93fc4aa9c2c9dab686a5d 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 76008e8f18a98db5bcd44b17ba94473dfa261e19..1cfcc2a6a01fa1f73daf2e3b98be0a4f8e9c7e38 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 94f86156a08ec27c06bf8f6295df27a96c1308cb..0d3284d44e72d8fc9a96b580da979050f05254fb 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 e8074201e7fe220a362ea2de71abca0d9cfd2dc9..61ed542e8a9596dcee7007ba59af6697c0a38ba3 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
currentRow: 0
diff --git a/tests/auto/controls/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml
index 4a7073d4b3e9684c382f711912f0ff69b0f92329..05d5743515ebdba21276a34c3c1a267c42df2679 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 d794e170cba5ad1304977e9b3c958592a596dfe9..079f32134461b9902767a029e3a60dfd0b7204bb 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 c39ae5335636d06fc3201041cc4d8b323adc64cf..9022d8ff45153bd78f0544437ce8140be93523e0 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 227fbd885eb98449f8d2bdfc22cb46a1607cbec5..3b458837d85bb5ce7e51d68de8740936dbbc6ff0 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
height: 120
diff --git a/tests/auto/controls/data/tableview/table_buttondelegate.qml b/tests/auto/controls/data/tableview/table_buttondelegate.qml
index d57025249cfb881f8d3f52691dd1622a5a3dbb02..f683aeac06b78342d18c2248ec324ebee000e71a 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
id: table
diff --git a/tests/auto/controls/data/tableview/table_delegate2.qml b/tests/auto/controls/data/tableview/table_delegate2.qml
index b55814eeb067020d72997294d585645996af9e3e..c9ad3d5eeb899041761b3f0c7b14e84778f683f0 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
id: table
diff --git a/tests/auto/controls/data/tableview/table_delegate3.qml b/tests/auto/controls/data/tableview/table_delegate3.qml
index 8ff374816b615deffab12e811fdc0384ca855830..e8922dd935984e595e72293f1bd03e8726499fc7 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
id: table
diff --git a/tests/auto/controls/data/tableview/table_dynamiccolumns.qml b/tests/auto/controls/data/tableview/table_dynamiccolumns.qml
index ce2cb93c4ce9964339f0b348caed1005260472c2..421a1ce97ffbcb08f7f8020683f457f9e0d07bf6 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
id: tableView
diff --git a/tests/auto/controls/data/tableview/table_mousearea.qml b/tests/auto/controls/data/tableview/table_mousearea.qml
index 32f74e04f6002d7645fb65c0bccb6ab97e00265f..f63149ab57a0a6fbb62328ee16b4a7afc6c8009a 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
width:400
diff --git a/tests/auto/controls/data/tableview/table_multicolumns.qml b/tests/auto/controls/data/tableview/table_multicolumns.qml
index bbfcab0ab39ba74df196fa4b381295c58b1f4657..58af9df6ac24802a9b9c898cae249afecdf6ecae 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TableView {
currentRow: 0
diff --git a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml
index d29704660b6212b556ccec67f75b7a328a92c80a..6b9760d04de3276aad717d5a8f0917f4d9589c24 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Row {
width: 200
diff --git a/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml b/tests/auto/controls/data/toolbutton/tb_exclusivegroup.qml
index 451818f34fff0048be16b331a89a506a7019f6c3..4f543fc1f3fa0bbf6966212c674bb76c45c25438 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Row {
width: 100
diff --git a/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml b/tests/auto/controls/data/toolbutton/tb_withCheckableAction.qml
index ff97307223040e6f12bad91879597c4d1bce4766..5b68153e3fb3976d16fde26005a84f3a6bbc58f4 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.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Row {
width: 200
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 29e2a3f630846a9c6ff49531de801b2cd9801bab..3836951c7fad84798cff119e294b057fbb28bf8c 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.0; Button {id: button1}', testCase, '');
+ var tmp = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button1}', testCase, '');
compare(tmp.isDefault, false);
tmp.destroy()
}
function test_text() {
- var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_1}', testCase, '');
+ var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button2_1}', testCase, '');
compare(tmp1.text, "");
tmp1.text = "Hello";
compare(tmp1.text, "Hello");
- var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {id: button2_2; text: "Hello"}', testCase, '');
+ var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
property var testAction: Action { \
id: testAction; \
@@ -110,7 +110,7 @@ TestCase {
}
function test_activeFocusOnPress(){
- var control = Qt.createQmlObject('import QtQuick.Controls 1.0; Button {x: 20; y: 20; width: 100; height: 50}', container, '')
+ var control = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 40600d9e3cd31449160260abb3ef638588b7adc4..2e3469d69c0bf7e9ad41adb4e7a472f6455d784b 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.0; CheckBox { }", container, "");
+ checkBox = Qt.createQmlObject("import QtQuick.Controls 1.1; CheckBox { }", container, "");
}
function cleanup() {
@@ -169,7 +169,7 @@ Item {
}
function test_exclusiveGroup() {
- var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \n"
+ "Row { \n"
+ " property alias checkBox1: checkBox1 \n"
+ " property alias checkBox2: checkBox2 \n"
@@ -243,7 +243,7 @@ Item {
skip("This function doesn't support NOT iterating all.")
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 1079294ceeca0d5d4cda3676886920acf486da6b..aed53c5b141d8a1f52323a8dc78b7712124d731b 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.0 ; ComboBox { model: 4 }', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', testCase, '');
compare(comboBox.currentIndex, 0)
@@ -93,7 +93,7 @@ TestCase {
}
function test_textrole() {
- var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; 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.0 ; ComboBox {}', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; 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.0 ; ComboBox {}', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, '');
comboBox.textRole = "text"
comboBox.model = arrayModel
compare(comboBox.currentIndex, 0)
@@ -137,7 +137,7 @@ TestCase {
function test_arrayModelWithoutTextRole() {
var arrayModel = ['Banana', 'Coconut', 'Apple']
- var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, '');
comboBox.model = arrayModel
compare(comboBox.currentIndex, 0)
compare(comboBox.currentText, "Banana")
@@ -149,7 +149,7 @@ TestCase {
skip("This function doesn't support NOT iterating all.")
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
@@ -220,7 +220,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.0 ; ComboBox { model: 4 }', container, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; 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
@@ -243,7 +243,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.0 ; ComboBox { model: 4 }', container, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, '');
var menuIndex = getMenuIndex(comboBox)
verify(menuIndex !== -1)
comboBox.forceActiveFocus()
@@ -262,7 +262,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.0 ; ComboBox { model: 4 }', container, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: 4 }', container, '');
var menuIndex = getMenuIndex(comboBox)
comboBox.currentIndex = 2
verify(menuIndex !== -1)
@@ -284,7 +284,7 @@ TestCase {
}
function test_addRemoveItemsInModel_QTBUG_30379() {
- var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox {}', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox {}', testCase, '');
comboBox.textRole = "text"
comboBox.model = model
var menuIndex = getMenuIndex(comboBox)
@@ -301,7 +301,7 @@ TestCase {
}
function test_width_QTBUG_30377() {
- var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { model: ["A", "BB", "CCCCC"] }', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { model: ["A", "BB", "CCCCC"] }', testCase, '');
compare(comboBox.currentIndex, 0)
var initialWidth = comboBox.width
comboBox.currentIndex = 1
@@ -312,7 +312,7 @@ TestCase {
}
function test_stringListModel() {
- var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { }', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { }', testCase, '');
comboBox.model = model_qstringlist;
compare(comboBox.currentIndex, 0)
compare(comboBox.currentText, "A")
@@ -326,7 +326,7 @@ TestCase {
}
function test_variantListModel() {
- var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.0 ; ComboBox { }', testCase, '');
+ var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.1 ; ComboBox { }', testCase, '');
comboBox.model = model_qvarlist;
compare(comboBox.currentIndex, 0)
compare(comboBox.currentText, "3")
diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml
index 97dbb9e57bd0d74409d02b4d834a3c5fcfe77cba..d5986eb76154a4ade6561842305be5b1d46a85cf 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/controls/data/tst_groupbox.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
Item {
@@ -91,7 +91,7 @@ TestCase {
function test_dynamicSize() {
- var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0 ; GroupBox {style:GroupBoxStyle{}}', container, '')
+ var groupbox = Qt.createQmlObject('import QtQuick.Controls 1.1; 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 9b416d6a7709d54b5de2f9ff2b025bad8f9e31ca..c6d200490abe465b746b0199dd10f1ba56ed3743 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.0; Label {}', testCase, '');
+ var label = Qt.createQmlObject('import QtQuick.Controls 1.1; Label {}', testCase, '');
label.destroy()
}
@@ -64,7 +64,7 @@ TestCase {
skip("This function doesn't support NOT iterating all.")
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml
index 11e92969b4fe4db0b672af0e2f2bb54be773b2e5..d915808069d18c52f34cb2df890d1cf82317d2df 100644
--- a/tests/auto/controls/data/tst_menu.qml
+++ b/tests/auto/controls/data/tst_menu.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TestCase {
id: testcase
diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml
index aa25917aad5463c62b940dabcd8cad762266ed50..8f46108cdac991e39d74dbedd5234b813752dcc9 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.0; MenuBar {}', testCase, '');
+ var menuBar = Qt.createQmlObject('import QtQuick.Controls 1.1; MenuBar {}', testCase, '');
menuBar.destroy()
}
}
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index 7febd6619858e5fdbff81ad55d7a497bccac88ae..b6b494fefb3c333139911218ff19a46a75a325da 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.0; ProgressBar {}', testCase, '');
+ var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, '');
progressBar.minimumValue = 5
progressBar.maximumValue = 10
@@ -69,7 +69,7 @@ TestCase {
}
function test_maximumvalue() {
- var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, '');
+ var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ProgressBar {}', testCase, '');
progressBar.minimumValue = 5
progressBar.maximumValue = 10
@@ -83,7 +83,7 @@ TestCase {
}
function test_invalidMinMax() {
- var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.0; ProgressBar {}', testCase, '');
+ var progressBar = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; ProgressBar {minimumValue: 10; maximumValue: 4; value: 5}', testCase, '');
+ var progressBar2 = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; ProgressBar {maximumValue: 100; value: 50}",
+ var progressBar = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar {maximumValue: 100; value: 50}",
testCase, '')
compare(progressBar.value, 50);
- var progressBar2 = Qt.createQmlObject("import QtQuick.Controls 1.0; ProgressBar {" +
+ var progressBar2 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar {" +
"value: 50; maximumValue: 100}",
testCase, '')
compare(progressBar2.value, 50);
- var progressBar3 = Qt.createQmlObject("import QtQuick.Controls 1.0; ProgressBar { minimumValue: -50 ; value:-10}",
+ var progressBar3 = Qt.createQmlObject("import QtQuick.Controls 1.1; ProgressBar { minimumValue: -50 ; value:-10}",
testCase, '')
compare(progressBar3.value, -10);
- var progressBar4 = Qt.createQmlObject("import QtQuick.Controls 1.0; ProgressBar { value:-10; minimumValue: -50}",
+ var progressBar4 = Qt.createQmlObject("import QtQuick.Controls 1.1; 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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 7d04c0c36194a4f9f4fb831d5de43c7eee1745d9..c8f7591272ca435f338f467f7346d973fd829eac 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.0; RadioButton {}', container, '');
+ radioButton = Qt.createQmlObject('import QtQuick.Controls 1.1; RadioButton {}', container, '');
}
function cleanup() {
@@ -139,7 +139,7 @@ Item {
}
function test_exclusiveGroup() {
- var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n"
+ var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.1; \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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index 7c476122bb1672501073df9d4e285324dffaa572..c9503b882f41d89f1cdadf59621bd98e6fb3aa3f 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
Item {
@@ -93,8 +93,8 @@ TestCase {
function test_clickToCenter() {
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
- import QtQuick.Controls.Styles 1.0; \
+ import QtQuick.Controls 1.1; \
+ import QtQuick.Controls.Styles 1.1; \
ScrollView { \
id: _control1; \
width: 100 ; height: 100; \
@@ -143,7 +143,7 @@ TestCase {
skip("This function doesn't support NOT iterating all.")
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml
index 80f34192860aa76f1fd606cc0f6d8a769b6791aa..106f9520b1f15fb027e3653ccb731ff22e7885ca 100644
--- a/tests/auto/controls/data/tst_shortcuts.qml
+++ b/tests/auto/controls/data/tst_shortcuts.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
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 177a8fcb21def819da8c1de1ec8d4d5e22ae09ee..57d79414cdae041548b26c50edf3f6026e79002c 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.0; Slider {}', testCase, '');
+ var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; Slider {}', testCase, '');
+ var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, '');
slider.minimumValue = 5
slider.maximumValue = 10
@@ -83,7 +83,7 @@ Item {
}
function test_maximumvalue() {
- var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', testCase, '');
+ var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, '');
slider.minimumValue = 5
slider.maximumValue = 10
@@ -94,7 +94,7 @@ Item {
}
function test_rightLeftKeyPressed() {
- var slider = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {}', container, '');
+ var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; Slider {}', container, '');
+ var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; Slider {x: 20; y: 20; width: 100; height: 50}', container, '')
+ var control = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
@@ -240,8 +240,8 @@ Item {
function test_updateValueWhileDragging() {
var controlString =
'import QtQuick 2.1 ; \
- import QtQuick.Controls 1.0 ; \
- import QtQuick.Controls.Styles 1.0; \
+ import QtQuick.Controls 1.1 ; \
+ import QtQuick.Controls.Styles 1.1; \
Slider { \
width: 200 ; \
height : 50; \
@@ -270,7 +270,7 @@ Item {
}
function test_sliderOffset() {
- var control = Qt.createQmlObject('import QtQuick.Controls 1.0; Slider {x: 20; y: 20; width: 100; height: 50}', container, '')
+ var control = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; Slider {minimumValue: 0; maximumValue: 100; width: 100; height: 20; stepSize: 1}', container, '');
+ var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; 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 267e9c4bd1d6d12348ea5ea25e25cb8aa903bc68..738be910633dacd2a79bc154d5458cfe9ea82b08 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.0; SpinBox {maximumValue: 50}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; SpinBox {minimumValue: 10}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {minimumValue: 10}', container, '')
spinbox.forceActiveFocus()
compare(spinbox.minimumValue, 10)
@@ -118,7 +118,7 @@ Item {
}
function test_keyboard_input(data) {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.forceActiveFocus()
if (data.decimals !== undefined)
@@ -141,7 +141,7 @@ Item {
}
function test_increment_mouse() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {maximumValue: 50}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {maximumValue: 50}', container, '')
spinbox.forceActiveFocus()
setCoordinates(spinbox)
@@ -157,7 +157,7 @@ Item {
}
function test_decrement_mouse() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {minimumValue: 10}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {minimumValue: 10}', container, '')
spinbox.forceActiveFocus()
setCoordinates(spinbox)
@@ -173,7 +173,7 @@ Item {
}
function test_move_mouse() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.forceActiveFocus()
setCoordinates(spinbox)
@@ -198,7 +198,7 @@ Item {
}
function test_maxvalue() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.value = spinbox.maximumValue + 1
compare(spinbox.value, spinbox.maximumValue)
@@ -215,7 +215,7 @@ Item {
}
function test_minvalue() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.value = spinbox.minimumValue - 1
compare(spinbox.value, spinbox.minimumValue)
@@ -232,7 +232,7 @@ Item {
}
function test_decimals() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.decimals = 0
spinbox.value = 1.00001
@@ -259,7 +259,7 @@ Item {
}
function test_groupSeparators() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox { maximumValue: 1000 }', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox { maximumValue: 1000 }', container, '')
spinbox.value = 1000
// QTBUG-31839: SpinBox displays group separators
@@ -270,7 +270,7 @@ Item {
function test_stepsize()
{
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.forceActiveFocus()
spinbox.stepSize = 2
@@ -289,7 +289,7 @@ Item {
function test_negativeStepSize()
{
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.forceActiveFocus()
spinbox.minimumValue = -50
@@ -321,12 +321,12 @@ Item {
function test_initialization_order()
{
- var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.0; SpinBox { id: spinbox;" +
+ var spinbox = Qt.createQmlObject("import QtQuick.Controls 1.1; SpinBox { id: spinbox;" +
"maximumValue: 2000; value: 1000; implicitWidth:80}",
container, '')
compare(spinbox.value, 1000);
- var spinbox2 = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox { minimumValue: -1000 ; value:-1000}',
+ var spinbox2 = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox { minimumValue: -1000 ; value:-1000}',
container, '')
compare(spinbox2.value, -1000);
spinbox.destroy()
@@ -334,7 +334,7 @@ Item {
}
function test_activeFocusOnPress(){
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {x: 20; y: 20; width: 100; height: 50}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {x: 20; y: 20; width: 100; height: 50}', container, '')
spinbox.activeFocusOnPress = false
verify(!spinbox.activeFocus)
mouseClick(spinbox, 30, 30)
@@ -348,7 +348,7 @@ Item {
function test_activeFocusOnTab() {
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
@@ -418,7 +418,7 @@ Item {
function test_ImplicitSize() // Verify if we correctly grow and shrink depending on contents
{
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.forceActiveFocus()
spinbox.minimumValue = -50
spinbox.maximumValue = 50
@@ -453,7 +453,7 @@ Item {
}
function test_wheel() {
- var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.0; SpinBox {}', container, '')
+ var spinbox = Qt.createQmlObject('import QtQuick.Controls 1.1; SpinBox {}', container, '')
spinbox.forceActiveFocus()
spinbox.minimumValue = 0
spinbox.maximumValue = 99
diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml
index 05101ff9a0e42fbf056db2fd0cce81c22eb7760f..80cd9fb970dcac0b04251b765805a9af7c958586 100644
--- a/tests/auto/controls/data/tst_splitview.qml
+++ b/tests/auto/controls/data/tst_splitview.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
TestCase {
diff --git a/tests/auto/controls/data/tst_stack.qml b/tests/auto/controls/data/tst_stack.qml
index a7363de7a67ef943b272c94cfb6323ccdf53cca6..c06eda3f35047b0e46003556de6bd14cb1f2fe88 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.0; import QtQuick.Controls 1.0; Item { property int index: Stack.index }', testCase, '');
+ var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property int index: Stack.index }', testCase, '');
compare(item.index, -1);
}
function test_status() {
- var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; Item { property int status: Stack.status }', testCase, '');
+ var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property int status: Stack.status }', testCase, '');
compare(item.status, 0); // Stack.Inactive
}
function test_view() {
- var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; Item { property StackView view: Stack.view }', testCase, '');
+ var item = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.1; Item { property StackView view: Stack.view }', testCase, '');
compare(item.view, null);
}
}
diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index 3daac7855ec0355cb1951ec9c010bebc5e694fea..e70cf458e475e49197f71072bc3d60e34ec7f4e3 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
TestCase {
id: testCase
diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml
index dfa198138b62d1bc829affaab1cfc7044db3e888..65bd83b1edfc3d02893d2d857b44684f79c45baf 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.0; StatusBar {}', container, '');
+ var statusBar = Qt.createQmlObject('import QtQuick.Controls 1.1; StatusBar {}', container, '');
statusBar.destroy()
}
@@ -64,7 +64,7 @@ TestCase {
skip("This function doesn't support NOT iterating all.")
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_styles.qml b/tests/auto/controls/data/tst_styles.qml
index f6b53b7229065822e3cb1d983610e743cee3cba1..fc56e48cd4f080d70e1ceb3ea6cc5858bb9f4226 100644
--- a/tests/auto/controls/data/tst_styles.qml
+++ b/tests/auto/controls/data/tst_styles.qml
@@ -55,105 +55,105 @@ Item {
function test_createButtonStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ButtonStyle {}}'
, container, '')
}
function test_createToolButtonStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
Rectangle { width: 50; height: 50; property Component style: ToolButtonStyle {}}'
, container, '')
}
function test_createCheckBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: CheckBoxStyle {}}'
, container, '')
}
function test_createComboBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ComboBoxStyle {}}'
, container, '')
}
function test_createRadioButtonStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: RadioButtonStyle {}}'
, container, '')
}
function test_createProgressBarStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ProgressBarStyle {}}'
, container, '')
}
function test_createSliderStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: SliderStyle {}}'
, container, '')
}
function test_createTextFieldStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: TextFieldStyle {}}'
, container, '')
}
function test_createSpinBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
Rectangle { width: 50; height: 50; property Component style: SpinBoxStyle {}}'
, container, '')
}
function test_createToolBarStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
Rectangle { width: 50; height: 50; property Component style: ToolBarStyle {}}'
, container, '')
}
function test_createStatusBarStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
Rectangle { width: 50; height: 50; property Component style: StatusBarStyle {}}'
, container, '')
}
function test_createTableViewStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: TableViewStyle {}}'
, container, '')
}
function test_createScrollViewStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: ScrollViewStyle {}}'
, container, '')
}
function test_createGroupBoxStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Private 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Private 1.0; \
Rectangle { width: 50; height: 50; property Component style: GroupBoxStyle {}}'
, container, '')
}
function test_createTabViewStyle() {
var control = Qt.createQmlObject(
- 'import QtQuick 2.1; import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0; \
+ 'import QtQuick 2.1; import QtQuick.Controls 1.1; import QtQuick.Controls.Styles 1.1; \
Rectangle { width: 50; height: 50; property Component style: TabViewStyle {}}'
, container, '')
}
diff --git a/tests/auto/controls/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml
index 939ede7e31c107846d8c0bbfa665e840f2a85145..cffe63b53e08fdad78c8af7b6aae8caa2ec9fd5a 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.0; Tab {}', testCase, '');
+ var tab = Qt.createQmlObject('import QtQuick.Controls 1.1; Tab {}', testCase, '');
tab.destroy()
}
}
diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml
index 8e57611336ac863e8b7ac5f8718ed5e229aef324..d0c713ef15a17b56f5dbfe48f80ff37f54676a6e 100644
--- a/tests/auto/controls/data/tst_tableview.qml
+++ b/tests/auto/controls/data/tst_tableview.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuickControlsTests 1.0
Item {
@@ -72,7 +72,7 @@ TestCase {
function test_basic_setup() {
var test_instanceStr =
'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
TableView { \
TableViewColumn { \
} \
@@ -353,7 +353,7 @@ TestCase {
}
function test_columnWidth() {
- var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TableView { }', testCase, '');
+ var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
compare(tableView.columnCount, 0)
var column = newColumn.createObject(testCase, {title: "title 1"});
verify(column.__view === null)
@@ -362,7 +362,7 @@ TestCase {
tableView.addColumn(column)
compare(column.__view, tableView)
compare(column.width, tableView.viewport.width)
- var tableView2 = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TableView { }', testCase, '');
+ var tableView2 = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
ignoreWarning("TableView::insertColumn(): you cannot add a column to multiple views")
tableView2.addColumn(column) // should not work
compare(column.__view, tableView) //same as before
@@ -384,7 +384,7 @@ TestCase {
}
function test_addRemoveColumn() {
- var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TableView { }', testCase, '');
+ var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
compare(tableView.columnCount, 0)
tableView.addColumn(newColumn.createObject(testCase, {title: "title 1"}))
compare(tableView.columnCount, 1)
@@ -462,7 +462,7 @@ TestCase {
}
function test_moveColumn(data) {
- var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TableView { }', testCase, '');
+ var tableView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TableView { }', testCase, '');
compare(tableView.columnCount, 0)
var titles = ["title 1", "title 2", "title 3"]
@@ -497,7 +497,7 @@ TestCase {
function test_positionViewAtRow() {
var test_instanceStr =
'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
TableView { \
TableViewColumn { \
} \
diff --git a/tests/auto/controls/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml
index 16eadf5382040cf7c5223e1fa0a21b130ca613c6..c471e40b2859f1358e2817305afc4d9a212dc6d5 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.0; TableViewColumn {}', testCase, '');
+ var tableViewColumn = Qt.createQmlObject('import QtQuick.Controls 1.1; TableViewColumn {}', testCase, '');
tableViewColumn.destroy()
}
}
diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml
index 8093ebc3746b3c15e8689889e357f1f02f68c886..980b1f1688fd0520fecb31d275655f096ce8b269 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.0; TabView {}', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick.Controls 1.1; TabView {}', testCase, '');
tabView.destroy()
}
function test_repeater() {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { } } }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { } } }', testCase, '');
compare(tabView.count, 3)
tabView.destroy()
}
@@ -70,7 +70,7 @@ TestCase {
}
function test_changeIndex() {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, '');
compare(tabView.count, 3)
verify(tabView.getTab(1).item == undefined)
tabView.currentIndex = 1
@@ -83,7 +83,7 @@ TestCase {
function test_addRemoveTab() {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; TabView { }', testCase, '');
compare(tabView.count, 0)
tabView.addTab("title 1", newTab)
compare(tabView.count, 1)
@@ -161,7 +161,7 @@ TestCase {
}
function test_moveTab(data) {
- var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { }', testCase, '');
+ var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; 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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
TabView { \
id: tabView; \
Tab { title: "static" } \
@@ -225,7 +225,7 @@ TestCase {
function test_mousePressOnTabBar() {
var test_tabView = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
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 7391daea186b175070ed67bc946eb973685e2c18..5d0778f152cb07b8ef32f985ae8a7c2d5ea6f3ec 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.0; TextArea {}', testCase, '')
+ var textarea = Qt.createQmlObject('import QtQuick.Controls 1.1; TextArea {}', testCase, '')
compare(textarea.text, "")
@@ -67,7 +67,7 @@ TestCase {
}
function test_activeFocusOnPress(){
- var control = Qt.createQmlObject('import QtQuick.Controls 1.0; TextArea {x: 20; y: 20; width: 100; height: 50}', container, '')
+ var control = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 6c754f103ef41dd337600461f4700a2fbed1b43e..6a1769974732ed7394eb41360669519ebf8c76c3 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.0; TextField {}', testCase, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', testCase, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', testCase, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '')
textfield.forceActiveFocus()
compare(textfield.readOnly, false)
@@ -92,7 +92,7 @@ TestCase {
}
function test_inputMask() {
- var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container , '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.1; import QtQuick.Controls 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
+ var textfield = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {}', container, '')
textfield.forceActiveFocus()
compare(textfield.cursorPosition, 0)
@@ -188,7 +188,7 @@ TestCase {
}
function test_selectWord() {
- var textfield = Qt.createQmlObject('import QtQuick.Controls 1.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', testCase, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {}', container, '')
+ var textfield = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.0; TextField {x: 20; y: 20; width: 100; height: 50}', container, '')
+ var control = Qt.createQmlObject('import QtQuick.Controls 1.1; TextField {x: 20; y: 20; width: 100; height: 50}', container, '')
control.activeFocusOnPress = false
verify(!control.activeFocus)
mouseClick(control, 30, 30)
@@ -283,7 +283,7 @@ TestCase {
function test_activeFocusOnTab() {
// Set TextField readonly so the tab/backtab can be tested toward the navigation
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index fe2c9bd2001b94be02f5f935a969faa8053f6429..60ca631385a38309c59e74ffc6700cdd5470eb1c 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.0; ToolBar {}', container, '');
+ var toolBar = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolBar {}', container, '');
toolBar.destroy()
}
@@ -64,7 +64,7 @@ TestCase {
skip("This function doesn't support NOT iterating all.")
var test_control = 'import QtQuick 2.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 6af5677cf128bbac9b9c3c942950dcc2883a3463..02ae5edef7bef4eb382c2eb719d908e47e913355 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.0; ToolButton {}', testCase, '');
+ var toolButton = Qt.createQmlObject('import QtQuick.Controls 1.1; ToolButton {}', testCase, '');
toolButton.destroy()
}
function test_activeFocusOnPress(){
- var control = Qt.createQmlObject('import QtQuick.Controls 1.0; ToolButton {x: 20; y: 20; width: 100; height: 50}', container, '')
+ var control = Qt.createQmlObject('import QtQuick.Controls 1.1; 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.1; \
- import QtQuick.Controls 1.0; \
+ import QtQuick.Controls 1.1; \
Item { \
width: 200; \
height: 200; \
diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml
index 2786bc83cda25d3f9bfc0daca4f08e92c34afd14..1d68068f1053a934d3ddc7a8dcd858957f25acb0 100644
--- a/tests/manual/ContextMenu.qml
+++ b/tests/manual/ContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Rectangle {
diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml
index 8f2cceddf2ab51ec77c6d9f718a880e745bf031f..78c783ea6689c48c55347a4bfd337cc8ed18afa5 100644
--- a/tests/manual/Layout.qml
+++ b/tests/manual/Layout.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
Item {
diff --git a/tests/manual/StackView.qml b/tests/manual/StackView.qml
index dc86e2f93f0c29939ce86a42ca5e9eccb2db0b72..8769e9a6040ae31152087b6080e8986b4fc4ab09 100644
--- a/tests/manual/StackView.qml
+++ b/tests/manual/StackView.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtQuick.Window 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Window {
width: 480
diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml
index ec9af904264244cd1db5761e83c784b30203193f..7e6ef0f56dc12c8b52213d4a9c20c6d6661c180b 100644
--- a/tests/manual/WindowContextMenu.qml
+++ b/tests/manual/WindowContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Window 2.1
Window {
diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml
index a245ca88cd20aaa5293890337d68e0bd6d03114d..69baf8ba399b19f966f211e5836e50ff84ec2dee 100644
--- a/tests/manual/scrollview/main.qml
+++ b/tests/manual/scrollview/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml
index e4b08e700972e92208b121f5f6ae47c01af0424a..768a9607e9bb98951347d3f4d08db0f5853ba31f 100644
--- a/tests/manual/splitter.qml
+++ b/tests/manual/splitter.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
ApplicationWindow {
width: 400
diff --git a/tests/manual/stackview/ButtonMenu.qml b/tests/manual/stackview/ButtonMenu.qml
index f10490e7125dfd7f0629696a6133283d38696c82..355c76db6401fcf4dc1bab0681b0dc31555102da 100644
--- a/tests/manual/stackview/ButtonMenu.qml
+++ b/tests/manual/stackview/ButtonMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
GridLayout {
diff --git a/tests/manual/stackview/View.qml b/tests/manual/stackview/View.qml
index 858bac61d38eab6eabe7a051e06f591412d058cf..ec844c9073b0888f5f629a93203559602a7abb6a 100644
--- a/tests/manual/stackview/View.qml
+++ b/tests/manual/stackview/View.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ColumnLayout {
diff --git a/tests/manual/stackview/main.qml b/tests/manual/stackview/main.qml
index f81c830903558c381b9daa3b54463291310f98ee..caf30f80c6cdf6f9a485b6c1edfc79dc819d6b0c 100644
--- a/tests/manual/stackview/main.qml
+++ b/tests/manual/stackview/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml
index a8d86eb39ad038c6c48e653353cb0f19c908263d..29ee0599af4cfeff8b31381523bd0f6f2320f819 100644
--- a/tests/manual/stretching.qml
+++ b/tests/manual/stretching.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Rectangle {
width: 600
diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml
index fa56757f293cada0f62f241971ba18deb4d7c906..b21162f3c8b305af4d2ca7955b982e4c86901f6d 100644
--- a/tests/manual/stretchingcustom.qml
+++ b/tests/manual/stretchingcustom.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Rectangle {
width: 600
diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml
index f9da0f6807ac6bad8826d9ba625e34a576aa18e6..d8130a5cfa671a41739ee3123c63b3e3b6b89312 100644
--- a/tests/manual/tableviewmodels/qml/main.qml
+++ b/tests/manual/tableviewmodels/qml/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Rectangle {
width: 360
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index af5dcd003dc62e351d30563ebcd2efca300976fb..e9d91fa24f6fbfb5dc07ac6928c4e2a92a856528 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
Item {
diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml
index 05061fcc59835f258c018eb57c5561872220daa7..ef569757d0f045b1887ea8241bb55a2d1ba3bade 100644
--- a/tests/manual/testbench/content/PropertyLayouts.qml
+++ b/tests/manual/testbench/content/PropertyLayouts.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
QtObject {
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index df7cea9bca511e08cf5764c5bd13537ad8e5a0c2..24acb111228e08de98c0aa369fde836c7517ab97 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import "content"
@@ -256,7 +256,7 @@ ApplicationWindow {
case "horizontalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft});
enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight});
@@ -265,7 +265,7 @@ ApplicationWindow {
case "textFormat":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText});
enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText});
@@ -274,7 +274,7 @@ ApplicationWindow {
case "verticalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop});
enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom});
@@ -283,7 +283,7 @@ ApplicationWindow {
case "textFormat":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText});
enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText});
@@ -292,7 +292,7 @@ ApplicationWindow {
case "inputMethodHints":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone});
enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText});
@@ -315,7 +315,7 @@ ApplicationWindow {
case "orientation":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal});
enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical});
@@ -323,7 +323,7 @@ ApplicationWindow {
case "echoMode":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal});
enumModelData.append({ text: "TextInput.Password", value: TextInput.Password});
@@ -335,7 +335,7 @@ ApplicationWindow {
case "textColor":
isColor = true
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Amber", value: "#FF7E00"});
enumModelData.append({ text: "Azure", value: "#007FFF"});
@@ -344,7 +344,7 @@ ApplicationWindow {
case "sortIndicatorOrder":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.AscendingOrder", value: Qt.AscendingOrder});
enumModelData.append({ text: "Qt.DescendingOrder", value: Qt.DescendingOrder});
@@ -352,7 +352,7 @@ ApplicationWindow {
case "checkedState":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Checked", value: Qt.Checked});
enumModelData.append({ text: "Qt.Unchecked", value: Qt.Unchecked});