diff options
160 files changed, 349 insertions, 349 deletions
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml index e43f0a4a..fe573aa6 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 5473e834..21f2489a 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 946dd374..0ad754e1 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 ac0a53a3..db9ae0f0 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 483d99ee..e733793b 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 e46a9ea0..e774ab52 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 4fa8504a..992607d6 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 1a9246f8..08976201 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 0d7ede25..14bfa623 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 f431a52e..95b99a83 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 dc0f5521..53882897 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 8eb91902..719adf44 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 7651a3c1..7070af47 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 605afef2..ba9aa1d6 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 9f93cb78..04509803 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 364b2b11..52acc3f8 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 bf8b0952..0c9518e6 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 f724e5af..b6611b9d 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 48d5e8b2..ab6b3da5 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 75af9844..4af49c14 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 b30c4f8f..5d069f55 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 c4ce0ded..4d1ed087 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 61c9daa9..1e230ea8 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 22124af8..85944d23 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 02348b71..858569e8 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 e48b1cda..e069e7c0 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 05916c0a..6b9a4415 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 0bf9174a..c81ef11f 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 110b8b2d..9ee330d3 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 ccad20b2..2037a16f 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 6cc1c683..2d9a8c9a 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 6b4c08ef..b06e0a3d 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 8341c922..1edc5575 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 e472e66e..0f127f15 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 fde08817..addee3e1 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 7d3d1d9d..5717d70f 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 0755a817..7e01d5c7 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 a952838c..473fe6db 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 e8d6fc9a..a63a2d6f 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 1f7eb1ab..d2af0d6c 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 0e249965..a2490b1a 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 85cc6681..303da729 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 aea5f721..768d5ab1 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 18dfec6a..60cd788b 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 7984a329..5a0ef937 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 6fd50e9a..27edf11c 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 1c3acada..1debd94a 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 895a6ef0..3a3b552d 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 4b2099f8..9be32459 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 ada97c10..eac78269 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 bac69d05..4e01a993 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 e8df1a55..a5f4372a 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 0d341a73..8d22b935 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 931db588..c1d137e1 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 f8ffffd9..578ac7fd 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 d73d9bcb..92fd87fd 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 dd47f7ca..bcc0a2fd 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 16d0fe94..bf4d533b 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 a5c03e7a..51fe8ca7 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 280740e4..4db41a05 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 2385873e..33e8f0ee 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 6bbb5b1d..2cc688a7 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 95397641..91a8e82c 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 420a0ab5..0bea860e 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 835dd718..0be0a8d6 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 291df0fb..41098972 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 960a163d..2e3296b6 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 834b8ab3..70fa0402 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 b41b959a..34d1efa8 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 ff03b3c3..9342d524 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 e435205e..fd426e35 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 24f51427..6fdd407e 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 930ca773..cb3cde47 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 51b70ea4..01851711 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 171678a3..d588202d 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 53282887..10bcab68 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 c295f731..48825fc7 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 25529f11..464210d8 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 0cf26341..88fd8349 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 6319d72c..e8dd9be8 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 68bd4424..9a53e019 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 f2e16ac0..81833c02 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 31762d20..bf2b1c79 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 1648ac57..a4867130 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 093df2e6..379b82e3 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 7f5fcb7a..410fa027 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 4eb6892f..5dda0375 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 746d7873..7b161bd1 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 e035ddba..15678329 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 aaae51c5..cfd0b4fa 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 f2823f16..b4ceb730 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 e16cb8f0..39235b47 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 1834ffc1..a6325020 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 c949ffeb..b5fe033a 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 673169a3..d9411c33 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 20f1a77f..210d377c 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 bd4c4826..d4e81301 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 e19648ae..71bf9983 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 6d1956fb..e3d69aa3 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 2320e240..74f5a23b 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 c9c6f5f5..56096dee 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 f058de00..1244b405 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 514a57c8..eda5ee72 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 76008e8f..1cfcc2a6 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 94f86156..0d3284d4 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 e8074201..61ed542e 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 4a7073d4..05d57435 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 d794e170..079f3213 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 c39ae533..9022d8ff 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 227fbd88..3b458837 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 d5702524..f683aeac 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 b55814ee..c9ad3d5e 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 8ff37481..e8922dd9 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 ce2cb93c..421a1ce9 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 32f74e04..f63149ab 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 bbfcab0a..58af9df6 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 d2970466..6b9760d0 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 451818f3..4f543fc1 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 ff973072..5b68153e 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 29e2a3f6..3836951c 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 40600d9e..2e3469d6 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 1079294c..aed53c5b 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 97dbb9e5..d5986eb7 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 9b416d6a..c6d20049 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 11e92969..d9158080 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 aa25917a..8f46108c 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 7febd661..b6b494fe 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 7d04c0c3..c8f75912 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 7c476122..c9503b88 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 80f34192..106f9520 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 177a8fcb..57d79414 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 267e9c4b..738be910 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 05101ff9..80cd9fb9 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 a7363de7..c06eda3f 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 3daac785..e70cf458 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 dfa19813..65bd83b1 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 f6b53b72..fc56e48c 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 939ede7e..cffe63b5 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 8e576113..d0c713ef 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 16eadf53..c471e40b 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 8093ebc3..980b1f16 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 7391daea..5d0778f1 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 6c754f10..6a176997 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 fe2c9bd2..60ca6313 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 6af5677c..02ae5ede 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 2786bc83..1d68068f 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 8f2ccedd..78c783ea 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 dc86e2f9..8769e9a6 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 ec9af904..7e6ef0f5 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 a245ca88..69baf8ba 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 e4b08e70..768a9607 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 f10490e7..355c76db 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 858bac61..ec844c90 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 f81c8309..caf30f80 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 a8d86eb3..29ee0599 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 fa56757f..b21162f3 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 f9da0f68..d8130a5c 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 af5dcd00..e9d91fa2 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 05061fcc..ef569757 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 df7cea9b..24acb111 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}); |