diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
tree | c0394c9cd5ce51961337a7a15e169074dd41632b | |
parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
1217 files changed, 3396 insertions, 3129 deletions
diff --git a/dist/changes-5.11.3 b/dist/changes-5.11.3 new file mode 100644 index 00000000..f71fa341 --- /dev/null +++ b/dist/changes-5.11.3 @@ -0,0 +1,20 @@ +Qt 5.11.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0 through 5.11.2. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0 new file mode 100644 index 00000000..fd9b1ba3 --- /dev/null +++ b/dist/changes-5.12.0 @@ -0,0 +1,171 @@ +Qt 5.12 introduces many new features and improvements as well as bugfixes +over the 5.11.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Controls * +**************************************************************************** + + - AbstractButton: + * Added implicitIndicatorWidth and implicitIndicatorHeight properties. + + - ComboBox: + * Added implicitIndicatorWidth and implicitIndicatorHeight properties. + + - Control: + * Added horizontalPadding and verticalPadding properties as a convenient + way to set both left and right, or top and bottom paddings in one go. + * Unless explicitly specified, baselineOffset is now automatically + updated based on the top padding of the control and the baselineOffset + of the contentItem. Styles no longer need to specify the + baselineOffset in QML. + * [QTBUG-60156] Added implicitBackgroundWidth and + implicitBackgroundHeight properties that can be used to simplify + complex implicit size bindings. + * Added implicitContentWidth and implicitContentHeight properties that + can be used to simplify complex implicit size bindings. + * [QTBUG-60156] Added topInset, bottomInset, leftInset, and rightInset + properties to control the geometry of the background similarly to how + paddings control the geometry of the contentItem. + + - Dial: + * [QTBUG-56323] Added the inputMode property. This property controls how + the dial is interacted with. The circular input mode (default, old + behavior) operates on an absolute input system, whereas the horizontal + and vertical input modes use a relative input system. + + - Dialog: + * Added implicitHeaderWidth, implicitHeaderHeight, implicitFooterWidth, + and implicitFooterHeight properties. + + - DialogButtonBox: + * Added buttonLayout property that can be used to arrange the buttons. + * Added contentWidth and contentHeight properties. + + - GroupBox: + * Added implicitLabelWidth and implicitLabelHeight properties. + + - Label: + * Added implicitBackgroundWidth and implicitBackgroundHeight properties + that can be used to simplify complex implicit size bindings. + [ChangeLog][Controls][TextArea] Added implicitBackgroundWidth and + implicitBackgroundHeight properties that can be used to simplify + complex implicit size bindings. [ChangeLog][Controls][TextField] Added + implicitBackgroundWidth and implicitBackgroundHeight properties that + can be used to simplify complex implicit size bindings. + * Added topInset, bottomInset, leftInset, and rightInset properties to + control the geometry of the background similarly to how paddings + control the geometry of the contentItem. + + - Page: + * Added implicitHeaderWidth, implicitHeaderHeight, implicitFooterWidth, + and implicitFooterHeight properties. + + - Popup: + * Added horizontalPadding and verticalPadding properties as a convenient + way to set both left and right, or top and bottom paddings in one go. + * [QTBUG-60354] Added anchors.centerIn to Popup to allow a covenient way + of centering a popup. + * Added implicitBackgroundWidth, implicitBackgroundHeight, + implicitContentWidth, and implicitContentHeight properties. + * [QTBUG-60156] Added topInset, bottomInset, leftInset, and rightInset + properties to control the geometry of the background similarly to how + paddings control the geometry of the contentItem. + + - QQuickStyle: + * [QTBUG-67062] Added stylePathList() and addStylePath() methods for + managing the list of directories where Qt Quick Controls 2 searches + for available styles. + + - RangeSlider: + * [QTBUG-67311] Added a moved() signal to each handle (similar to the + Slider's moved() signal) to react to the values being interactively + changed by the user. + * [QTBUG-67317] Added a valueAt() function to allow accessing each + handle's value when the live property is set to false. + * Added first.implicitHandleWidth, first.implicitHandleHeight, + second.implicitHandleWidth, and second.implicitHandleHeight + properties. + * [QTBUG-62784] Added touchDragThreshold property for configuring the + threshold to initiate the touch 'drag' of the handle of the slider. The + mouse 'drag' won't be affected by the property. + + - Slider: + * Added implicitHandleWidth and implicitHandleHeight properties. + * [QTBUG-62784] Added touchDragThreshold property for configuring the + threshold to initiate the touch 'drag' of the handle of the slider. The + mouse 'drag' won't be affected by the property. + + - SpinBox: + * Added up.implicitIndicatorWidth, up.implicitIndicatorHeight, + down.implicitIndicatorWidth, and down.implicitIndicatorHeight + properties. + + - SwipeView: + * Added contentWidth and contentHeight properties. + + - TextArea: + * Added topInset, bottomInset, leftInset, and rightInset properties to + control the geometry of the background similarly to how paddings + control the geometry of the contentItem. + * Added placeholderTextColor property for user convenience to customize + the placeholderText color to fit the backgrounds. + + - TextField: + * Added topInset, bottomInset, leftInset, and rightInset properties to + control the geometry of the background similarly to how paddings + control the geometry of the contentItem. + * [QTBUG-66260] Added placeholderTextColor property for user convenience + to customize the placeholderText color to fit the backgrounds. + + - ToolTip: + * [QTBUG-62890] Added non-attached show() and hide() methods to make it + more flexible to meet certain requirements. + + - Tumbler: + * [QTBUG-66358] Added positionViewAtIndex() function that calls the + respective PathView/ListView function, depending on the value of wrap. + This allows changing currentIndex without animations. + +**************************************************************************** +* Material * +**************************************************************************** + + - [QTBUG-51109] Added Dense variant of the Material style for use on + desktop platforms. Some controls are slightly smaller in height and use + smaller font sizes. The variant can be enabled by setting + QT_QUICK_CONTROLS_MATERIAL_VARIANT to Dense or setting Variant=Dense in + the qtquickcontrols.conf file. + +**************************************************************************** +* Platform * +**************************************************************************** + + - Menu: + * [QTBUG-67730] Deprecated iconName and iconSource properties in favor + of icon.name and icon.source grouped properties. + * [QTBUG-67730] Added icon.mask grouped property. + [ChangeLog][Platform][MenuItem] Added icon.mask grouped property. + [ChangeLog][Platform][SystemTrayIcon] Added icon.mask grouped + property. + + - MenuItem: + * [QTBUG-67730] Deprecated iconName and iconSource properties in favor + of icon.name and icon.source grouped properties. + + - SystemTrayIcon: + * [QTBUG-67730] Deprecated iconName and iconSource properties in favor + of icon.name and icon.source grouped properties. diff --git a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml index 53bf6620..29e5c300 100644 --- a/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter1-settingup/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 540 diff --git a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml index 150fd004..8308f5c0 100644 --- a/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter2-lists/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 540 diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml index 200fa0ae..826aee42 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ContactPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml index 61436057..90a846ac 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/ConversationPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Page { id: root diff --git a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml index 71ec250c..3c0d1a23 100644 --- a/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter3-navigation/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml index 1051b189..61819491 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter4-models/ContactPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import io.qt.examples.chattutorial 1.0 diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml index bcae4b99..6684c233 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter4-models/ConversationPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 import io.qt.examples.chattutorial 1.0 diff --git a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml index 71ec250c..3c0d1a23 100644 --- a/examples/quickcontrols2/chattutorial/chapter4-models/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter4-models/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml index 70cf97d9..1252706b 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/+material/ChatToolBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 ToolBar { Material.theme: Material.Dark diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml index ddbc6a1b..32e6217c 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ChatToolBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 ToolBar { } diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml index ad37ba5f..f26712f8 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ContactPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import io.qt.examples.chattutorial 1.0 diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml index 2ec6a55e..790f9ee9 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/ConversationPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 import io.qt.examples.chattutorial 1.0 diff --git a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml index 71ec250c..3c0d1a23 100644 --- a/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml +++ b/examples/quickcontrols2/chattutorial/chapter5-styling/main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index aea27d94..f7cbd32f 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -28,7 +28,8 @@ /*! \example chattutorial \keyword Qt Quick Controls - Chat Tutorial - \title Qt Quick Controls 2 - Chat Tutorial + \title Qt Quick Controls - Chat Tutorial + \keyword Qt Quick Controls 2 - Chat Tutorial \brief Tutorial about writing a basic chat client using Qt Quick Controls 2. \ingroup qtquickcontrols2-examples @@ -97,7 +98,7 @@ Let's modify the default QML code to suit our needs. \quotefromfile chattutorial/chapter1-settingup/main.qml \skipto import -\printuntil import QtQuick.Controls 2.1 +\printuntil import QtQuick.Controls 2.12 First, import the \l {Qt Quick} module. This gives us access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so @@ -767,7 +768,7 @@ their text color to something lighter. The simplest way of doing so is to import the Material style directly and use the Material attached property: \code - import QtQuick.Controls.Material 2.1 + import QtQuick.Controls.Material 2.12 // ... diff --git a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml index c3047dcb..36803599 100644 --- a/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactDelegate.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 ItemDelegate { id: delegate diff --git a/examples/quickcontrols2/contactlist/ContactDialog.qml b/examples/quickcontrols2/contactlist/ContactDialog.qml index 3fa0af40..7569f356 100644 --- a/examples/quickcontrols2/contactlist/ContactDialog.qml +++ b/examples/quickcontrols2/contactlist/ContactDialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dialog { id: dialog diff --git a/examples/quickcontrols2/contactlist/ContactForm.ui.qml b/examples/quickcontrols2/contactlist/ContactForm.ui.qml index 831d3fcd..5988735a 100644 --- a/examples/quickcontrols2/contactlist/ContactForm.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 GridLayout { id: grid diff --git a/examples/quickcontrols2/contactlist/ContactView.ui.qml b/examples/quickcontrols2/contactlist/ContactView.ui.qml index ef47f551..747f3042 100644 --- a/examples/quickcontrols2/contactlist/ContactView.ui.qml +++ b/examples/quickcontrols2/contactlist/ContactView.ui.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import Backend 1.0 ListView { diff --git a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml index 884daf03..e7d7c2aa 100644 --- a/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml +++ b/examples/quickcontrols2/contactlist/SectionDelegate.ui.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolBar { id: background diff --git a/examples/quickcontrols2/contactlist/contactlist.qml b/examples/quickcontrols2/contactlist/contactlist.qml index edddfc02..f79c609b 100644 --- a/examples/quickcontrols2/contactlist/contactlist.qml +++ b/examples/quickcontrols2/contactlist/contactlist.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml index c25789fa..12c1d416 100644 --- a/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml +++ b/examples/quickcontrols2/contactlist/designer/Backend/ContactModel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 ListModel { ListElement { diff --git a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc index 110f398f..2c692430 100644 --- a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc +++ b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc @@ -27,7 +27,8 @@ /*! \example contactlist \keyword Qt Quick Controls - Contact List - \title Qt Quick Controls 2 - Contact List + \title Qt Quick Controls - Contact List + \keyword Qt Quick Controls 2 - Contact List \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class that implements a simple contact list. diff --git a/examples/quickcontrols2/flatstyle/Flat/Button.qml b/examples/quickcontrols2/flatstyle/Flat/Button.qml index c56a9c6a..0420ddb4 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Button.qml +++ b/examples/quickcontrols2/flatstyle/Flat/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import Theme 1.0 T.Button { diff --git a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml index 332d63b8..ae819afa 100644 --- a/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml +++ b/examples/quickcontrols2/flatstyle/Flat/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import Theme 1.0 T.CheckBox { diff --git a/examples/quickcontrols2/flatstyle/Flat/Switch.qml b/examples/quickcontrols2/flatstyle/Flat/Switch.qml index 00b38767..3eea062f 100644 --- a/examples/quickcontrols2/flatstyle/Flat/Switch.qml +++ b/examples/quickcontrols2/flatstyle/Flat/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import Theme 1.0 T.Switch { diff --git a/examples/quickcontrols2/flatstyle/MainForm.ui.qml b/examples/quickcontrols2/flatstyle/MainForm.ui.qml index 06b87d5e..e25158a3 100644 --- a/examples/quickcontrols2/flatstyle/MainForm.ui.qml +++ b/examples/quickcontrols2/flatstyle/MainForm.ui.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import Theme 1.0 Item { diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc index c123b27e..a71c2093 100644 --- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc +++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc @@ -28,7 +28,8 @@ /*! \example flatstyle \keyword Qt Quick Controls - Flat Style - \title Qt Quick Controls 2 - Flat Style + \title Qt Quick Controls - Flat Style + \keyword Qt Quick Controls 2 - Flat Style \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a QML plugin with customized controls. diff --git a/examples/quickcontrols2/flatstyle/flatstyle.qml b/examples/quickcontrols2/flatstyle/flatstyle.qml index f3e35876..44a29cda 100644 --- a/examples/quickcontrols2/flatstyle/flatstyle.qml +++ b/examples/quickcontrols2/flatstyle/flatstyle.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import Qt.labs.platform 1.0 import Theme 1.0 diff --git a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml index 003e743b..9018ece5 100644 --- a/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml +++ b/examples/quickcontrols2/flatstyle/imports/Theme/Theme.qml @@ -50,7 +50,7 @@ pragma Singleton -import QtQuick 2.8 +import QtQuick 2.12 QtObject { readonly property color gray: "#b2b1b1" diff --git a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc index 560acf52..463acdee 100644 --- a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc +++ b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc @@ -28,7 +28,8 @@ /*! \example gallery \keyword Qt Quick Controls - Gallery - \title Qt Quick Controls 2 - Gallery + \title Qt Quick Controls - Gallery + \keyword Qt Quick Controls 2 - Gallery \ingroup qtquickcontrols2-examples \brief A gallery of controls. diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index 5344b74e..e9f0b432 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Material 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Universal 2.12 import Qt.labs.settings 1.0 ApplicationWindow { diff --git a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml index 3fbae0ce..b0aa6284 100644 --- a/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml +++ b/examples/quickcontrols2/gallery/pages/BusyIndicatorPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ButtonPage.qml b/examples/quickcontrols2/gallery/pages/ButtonPage.qml index 7ebceb49..c77b41e4 100644 --- a/examples/quickcontrols2/gallery/pages/ButtonPage.qml +++ b/examples/quickcontrols2/gallery/pages/ButtonPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml index a8a16928..7795f814 100644 --- a/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/CheckBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml index bc89e998..ec75607c 100644 --- a/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/ComboBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml index 974dcab1..91110567 100644 --- a/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml +++ b/examples/quickcontrols2/gallery/pages/DelayButtonPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml index bf07e1b5..30f07be1 100644 --- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml +++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Pane { padding: 0 diff --git a/examples/quickcontrols2/gallery/pages/DialPage.qml b/examples/quickcontrols2/gallery/pages/DialPage.qml index a8fa9764..3bb3bb28 100644 --- a/examples/quickcontrols2/gallery/pages/DialPage.qml +++ b/examples/quickcontrols2/gallery/pages/DialPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/DialogPage.qml b/examples/quickcontrols2/gallery/pages/DialogPage.qml index 8bade21f..9d23e260 100644 --- a/examples/quickcontrols2/gallery/pages/DialogPage.qml +++ b/examples/quickcontrols2/gallery/pages/DialogPage.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/FramePage.qml b/examples/quickcontrols2/gallery/pages/FramePage.qml index a1d7d7f7..4834d04d 100644 --- a/examples/quickcontrols2/gallery/pages/FramePage.qml +++ b/examples/quickcontrols2/gallery/pages/FramePage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml index bb332a8b..16f8762a 100644 --- a/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/GroupBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml index ed35c07e..4f13ce33 100644 --- a/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml +++ b/examples/quickcontrols2/gallery/pages/PageIndicatorPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml index 36bba90c..1f3c81b9 100644 --- a/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml +++ b/examples/quickcontrols2/gallery/pages/ProgressBarPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml index 451caf58..b573731e 100644 --- a/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml +++ b/examples/quickcontrols2/gallery/pages/RadioButtonPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml index 9e8d9a95..b6c35766 100644 --- a/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml +++ b/examples/quickcontrols2/gallery/pages/RangeSliderPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml index aaa1d8ea..d9e77fa4 100644 --- a/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml +++ b/examples/quickcontrols2/gallery/pages/ScrollBarPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Flickable { id: flickable diff --git a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml index 89b8bc1a..2adcbc6b 100644 --- a/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml +++ b/examples/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Flickable { id: flickable diff --git a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml index 90bd0145..afb5ef5c 100644 --- a/examples/quickcontrols2/gallery/pages/ScrollablePage.qml +++ b/examples/quickcontrols2/gallery/pages/ScrollablePage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Page { id: page diff --git a/examples/quickcontrols2/gallery/pages/SliderPage.qml b/examples/quickcontrols2/gallery/pages/SliderPage.qml index 9d941d01..93a1ebb1 100644 --- a/examples/quickcontrols2/gallery/pages/SliderPage.qml +++ b/examples/quickcontrols2/gallery/pages/SliderPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml index b063a37d..9e458331 100644 --- a/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml +++ b/examples/quickcontrols2/gallery/pages/SpinBoxPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/StackViewPage.qml b/examples/quickcontrols2/gallery/pages/StackViewPage.qml index 45884a70..43ee5684 100644 --- a/examples/quickcontrols2/gallery/pages/StackViewPage.qml +++ b/examples/quickcontrols2/gallery/pages/StackViewPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 StackView { id: stackView diff --git a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml index d09ac501..3c3bc56c 100644 --- a/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml +++ b/examples/quickcontrols2/gallery/pages/SwipeViewPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Pane { id: pane diff --git a/examples/quickcontrols2/gallery/pages/SwitchPage.qml b/examples/quickcontrols2/gallery/pages/SwitchPage.qml index d894ed56..53ee1660 100644 --- a/examples/quickcontrols2/gallery/pages/SwitchPage.qml +++ b/examples/quickcontrols2/gallery/pages/SwitchPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/TabBarPage.qml b/examples/quickcontrols2/gallery/pages/TabBarPage.qml index 16200fc2..7f5cbce5 100644 --- a/examples/quickcontrols2/gallery/pages/TabBarPage.qml +++ b/examples/quickcontrols2/gallery/pages/TabBarPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Page { id: page diff --git a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml index d83096d5..7ed2b58b 100644 --- a/examples/quickcontrols2/gallery/pages/TextAreaPage.qml +++ b/examples/quickcontrols2/gallery/pages/TextAreaPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml index 959d9681..37a5d605 100644 --- a/examples/quickcontrols2/gallery/pages/TextFieldPage.qml +++ b/examples/quickcontrols2/gallery/pages/TextFieldPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml index bc2aa81a..295ea2c4 100644 --- a/examples/quickcontrols2/gallery/pages/ToolTipPage.qml +++ b/examples/quickcontrols2/gallery/pages/ToolTipPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/gallery/pages/TumblerPage.qml b/examples/quickcontrols2/gallery/pages/TumblerPage.qml index bc0aa24e..af4caee3 100644 --- a/examples/quickcontrols2/gallery/pages/TumblerPage.qml +++ b/examples/quickcontrols2/gallery/pages/TumblerPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollablePage { id: page diff --git a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc index 6e293450..4e3d3352 100644 --- a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc +++ b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc @@ -28,7 +28,8 @@ /*! \example imagine/automotive \keyword Qt Quick Controls - Imagine Style Example: Automotive - \title Qt Quick Controls 2 - Imagine Style Example: Automotive + \title Qt Quick Controls - Imagine Style Example: Automotive + \keyword Qt Quick Controls 2 - Imagine Style Example: Automotive \ingroup qtquickcontrols2-examples \brief An automotive user interface using custom Imagine style assets. diff --git a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml index dfd66ada..483059ae 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/CustomGlow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtGraphicalEffects 1.0 +import QtGraphicalEffects 1.12 Glow { color: glowColor diff --git a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml index e19d8665..d86b39c7 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/FeatureButton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Button { id: button diff --git a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml index 50f816ce..088e9c16 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/GlowingLabel.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 // This container and the transform on the Label are // necessary to get precise bounding rect of the text for layouting reasons, diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml index 86355bb0..91e3bf7c 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 import QtQuick.Window 2.0 ApplicationWindow { diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc index f6c2189f..28d298e7 100644 --- a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc +++ b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc @@ -28,7 +28,8 @@ /*! \example imagine/musicplayer \keyword Qt Quick Controls - Imagine Style Example: Music Player - \title Qt Quick Controls 2 - Imagine Style Example: Music Player + \title Qt Quick Controls - Imagine Style Example: Music Player + \keyword Qt Quick Controls 2 - Imagine Style Example: Music Player \ingroup qtquickcontrols2-examples \brief An audio player user interface using custom Imagine style assets. diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml index f772fa42..de4fd281 100644 --- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml +++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.0 ApplicationWindow { diff --git a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc index a7d0828e..49e997fb 100644 --- a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc +++ b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc @@ -28,7 +28,8 @@ /*! \example sidepanel \keyword Qt Quick Controls - Side Panel - \title Qt Quick Controls 2 - Side Panel + \title Qt Quick Controls - Side Panel + \keyword Qt Quick Controls 2 - Side Panel \ingroup qtquickcontrols2-examples \brief A persistent side panel with Drawer. diff --git a/examples/quickcontrols2/sidepanel/sidepanel.qml b/examples/quickcontrols2/sidepanel/sidepanel.qml index f7e459fc..e2473ac9 100644 --- a/examples/quickcontrols2/sidepanel/sidepanel.qml +++ b/examples/quickcontrols2/sidepanel/sidepanel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import QtQuick.Controls.Material 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 ApplicationWindow { id: window diff --git a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc index 9fd05261..c359a423 100644 --- a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc +++ b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc @@ -28,7 +28,8 @@ /*! \example swipetoremove \keyword Qt Quick Controls - Swipe to Remove - \title Qt Quick Controls 2 - Swipe to Remove + \title Qt Quick Controls - Swipe to Remove + \keyword Qt Quick Controls 2 - Swipe to Remove \ingroup qtquickcontrols2-examples \brief Demonstrates removal of list items by swipe gesture. diff --git a/examples/quickcontrols2/swipetoremove/swipetoremove.qml b/examples/quickcontrols2/swipetoremove/swipetoremove.qml index 942669ce..b4b0d588 100644 --- a/examples/quickcontrols2/swipetoremove/swipetoremove.qml +++ b/examples/quickcontrols2/swipetoremove/swipetoremove.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.2 -import QtQuick.Controls.Material 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 ApplicationWindow { id: window diff --git a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc index 6ba64b34..3e9a9268 100644 --- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc +++ b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc @@ -27,7 +27,8 @@ /*! \example texteditor \keyword Qt Quick Controls - Text Editor - \title Qt Quick Controls 2 - Text Editor + \title Qt Quick Controls - Text Editor + \keyword Qt Quick Controls 2 - Text Editor \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class to provide a fully-functional rich-text editor application. diff --git a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml index 911cb9f3..e56eddcd 100644 --- a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml +++ b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.0 import io.qt.examples.texteditor 1.0 diff --git a/examples/quickcontrols2/texteditor/qml/texteditor.qml b/examples/quickcontrols2/texteditor/qml/texteditor.qml index 9d50daf5..a1cb3435 100644 --- a/examples/quickcontrols2/texteditor/qml/texteditor.qml +++ b/examples/quickcontrols2/texteditor/qml/texteditor.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.0 import Qt.labs.platform 1.0 diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc index fae719f8..95e8329d 100644 --- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc +++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc @@ -28,7 +28,8 @@ /*! \example wearable \keyword Qt Quick Controls - Wearable Demo - \title Qt Quick Controls 2 - Wearable Demo + \title Qt Quick Controls - Wearable Demo + \keyword Qt Quick Controls 2 - Wearable Demo \ingroup qtquickcontrols2-examples \brief Demonstrates an application launcher designed for wearable devices. diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml index 99343d24..6874008f 100644 --- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/DemoMode.qml b/examples/quickcontrols2/wearable/qml/DemoMode.qml index c67a56e6..9d0f4d6b 100644 --- a/examples/quickcontrols2/wearable/qml/DemoMode.qml +++ b/examples/quickcontrols2/wearable/qml/DemoMode.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import "Style" diff --git a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml index 66ced325..88678b36 100644 --- a/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml +++ b/examples/quickcontrols2/wearable/qml/DemoModeIndicator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import "Style" diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml index 1f018e2e..0e361066 100644 --- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml +++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml index 53c9e5a4..96a2d975 100644 --- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml +++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import "Style" diff --git a/examples/quickcontrols2/wearable/qml/NaviButton.qml b/examples/quickcontrols2/wearable/qml/NaviButton.qml index 5058bd62..55ccc19d 100644 --- a/examples/quickcontrols2/wearable/qml/NaviButton.qml +++ b/examples/quickcontrols2/wearable/qml/NaviButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import "Style" diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml index 8ab82bac..4a7fbde1 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import "../Style" import "navigation.js" as NavigationData diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml index 937b84a8..005ae3f7 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import "../Style" Rectangle { diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml index eeddf6dc..b3102771 100644 --- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import "../Style" import "notifications.js" as NotificationData diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml index bb347e7d..23bb9acd 100644 --- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml index 81d4c9ef..68485f5d 100644 --- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml +++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import "." T.PageIndicator { diff --git a/examples/quickcontrols2/wearable/qml/Style/Slider.qml b/examples/quickcontrols2/wearable/qml/Style/Slider.qml index cdff4aec..a0be11c7 100644 --- a/examples/quickcontrols2/wearable/qml/Style/Slider.qml +++ b/examples/quickcontrols2/wearable/qml/Style/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import "." T.Slider { diff --git a/examples/quickcontrols2/wearable/qml/Style/Switch.qml b/examples/quickcontrols2/wearable/qml/Style/Switch.qml index b1597737..4a0f4e49 100644 --- a/examples/quickcontrols2/wearable/qml/Style/Switch.qml +++ b/examples/quickcontrols2/wearable/qml/Style/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import "." T.Switch { diff --git a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml index f4a5df69..0efe84e5 100644 --- a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml +++ b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 pragma Singleton diff --git a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml index 6d4b687f..1417d9f7 100644 --- a/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml +++ b/examples/quickcontrols2/wearable/qml/SwipeViewPage.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { // Don't show the item when the StackView that contains us diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml index 256e60a4..2d411302 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml +++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml index 158f3d70..613d936b 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import ".." import "../Style" diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml index 1456072f..8def8b45 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import "../Style" diff --git a/examples/quickcontrols2/wearable/wearable.qml b/examples/quickcontrols2/wearable/wearable.qml index ea84adca..bda7d169 100644 --- a/examples/quickcontrols2/wearable/wearable.qml +++ b/examples/quickcontrols2/wearable/wearable.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Controls 2.3 as QQC2 import Qt.labs.settings 1.0 import "qml" diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 23e3c30e..2fc0d6f7 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractDayOfWeekRow { diff --git a/src/imports/calendar/MonthGrid.qml b/src/imports/calendar/MonthGrid.qml index 95e2a801..884ce65f 100644 --- a/src/imports/calendar/MonthGrid.qml +++ b/src/imports/calendar/MonthGrid.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractMonthGrid { diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index c46e25ae..e2c9d98b 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.11 +import QtQuick 2.12 import Qt.labs.calendar 1.0 AbstractWeekNumberColumn { diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml index 0a7f1688..6f6e8f2e 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 //! [1] ListView { diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml index d7e56384..2de76098 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml index c98372b4..e52ebb2d 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml index fed2cc5a..5710b4dd 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml index 4427d343..cdb7201e 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml index a8e5717b..18613f12 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml index 1d42c1c3..f086468b 100644 --- a/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml +++ b/src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import Qt.labs.calendar 1.0 //! [1] diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/AbstractButton.qml index f3dda0af..50ddb933 100644 --- a/src/imports/controls/AbstractButton.qml +++ b/src/imports/controls/AbstractButton.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.AbstractButton { id: control diff --git a/src/imports/controls/Action.qml b/src/imports/controls/Action.qml index fe86213a..996e9086 100644 --- a/src/imports/controls/Action.qml +++ b/src/imports/controls/Action.qml @@ -35,6 +35,6 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.Action { } diff --git a/src/imports/controls/ActionGroup.qml b/src/imports/controls/ActionGroup.qml index ae8772d6..89e72c8f 100644 --- a/src/imports/controls/ActionGroup.qml +++ b/src/imports/controls/ActionGroup.qml @@ -35,6 +35,6 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.ActionGroup { } diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 4ad97082..4686a298 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ApplicationWindow { id: window diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index a79e2620..ff5c191c 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.BusyIndicator { id: control diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 4132e326..a9e7fce6 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Button { id: control diff --git a/src/imports/controls/ButtonGroup.qml b/src/imports/controls/ButtonGroup.qml index 50d3b840..cf0355ba 100644 --- a/src/imports/controls/ButtonGroup.qml +++ b/src/imports/controls/ButtonGroup.qml @@ -35,6 +35,6 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.ButtonGroup { } diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index be4e62a6..c58399f7 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml index 3e58ffbb..71b390ac 100644 --- a/src/imports/controls/CheckDelegate.qml +++ b/src/imports/controls/CheckDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 5cef9e55..6b7fe008 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ComboBox { id: control diff --git a/src/imports/controls/Container.qml b/src/imports/controls/Container.qml index 1f30de42..83ab957d 100644 --- a/src/imports/controls/Container.qml +++ b/src/imports/controls/Container.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.Container { id: control diff --git a/src/imports/controls/Control.qml b/src/imports/controls/Control.qml index ff1c0b08..a963a563 100644 --- a/src/imports/controls/Control.qml +++ b/src/imports/controls/Control.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.Control { id: control diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml index 024ebcfe..1c545a71 100644 --- a/src/imports/controls/DelayButton.qml +++ b/src/imports/controls/DelayButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.DelayButton { id: control diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index 37a9edbe..b6324db5 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Dial { id: control diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml index 5f8d74c4..6c2e4b1b 100644 --- a/src/imports/controls/Dialog.qml +++ b/src/imports/controls/Dialog.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml index aa0353c0..1b783b3b 100644 --- a/src/imports/controls/DialogButtonBox.qml +++ b/src/imports/controls/DialogButtonBox.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.DialogButtonBox { id: control diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 0b882f90..17465fd4 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Drawer { id: control diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 9ada5273..2fe46104 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Frame { id: control diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index e16148bc..96f776f2 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.GroupBox { id: control diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml index a7cc499d..8cc12cab 100644 --- a/src/imports/controls/ItemDelegate.qml +++ b/src/imports/controls/ItemDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ItemDelegate { id: control diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index 6c3c05d4..9a42635f 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Label { id: control diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index cebca827..041942f5 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/MenuBar.qml b/src/imports/controls/MenuBar.qml index 9e145b6a..122cdc53 100644 --- a/src/imports/controls/MenuBar.qml +++ b/src/imports/controls/MenuBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/MenuBarItem.qml index e1ba4a41..f6835412 100644 --- a/src/imports/controls/MenuBarItem.qml +++ b/src/imports/controls/MenuBarItem.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 7af280a3..22cdf3ea 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.MenuItem { id: control diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml index 43c421a3..cc5c2b6e 100644 --- a/src/imports/controls/MenuSeparator.qml +++ b/src/imports/controls/MenuSeparator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.MenuSeparator { id: control diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml index 844f44d1..4b3cf3d2 100644 --- a/src/imports/controls/Page.qml +++ b/src/imports/controls/Page.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Page { id: control diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 6985919b..78f9e3cf 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.PageIndicator { id: control diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml index ee715c86..47b916e3 100644 --- a/src/imports/controls/Pane.qml +++ b/src/imports/controls/Pane.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Pane { id: control diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml index 13de88a3..ee243c10 100644 --- a/src/imports/controls/Popup.qml +++ b/src/imports/controls/Popup.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Popup { id: control diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index c6b773ce..61cdea43 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 02251239..726e8862 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RadioButton { id: control diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index 3846cd34..a7e7dec0 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RadioDelegate { id: control diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 6de74a9f..c3e7c964 100644 --- a/src/imports/controls/RangeSlider.qml +++ b/src/imports/controls/RangeSlider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RangeSlider { id: control diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml index 11649094..825d5252 100644 --- a/src/imports/controls/RoundButton.qml +++ b/src/imports/controls/RoundButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.RoundButton { id: control diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index c16b4356..1cff0afc 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ScrollBar { id: control diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 96099bf1..795c20ee 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ScrollIndicator { id: control diff --git a/src/imports/controls/ScrollView.qml b/src/imports/controls/ScrollView.qml index 57299575..f775d624 100644 --- a/src/imports/controls/ScrollView.qml +++ b/src/imports/controls/ScrollView.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ScrollView { id: control diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 3d95cae9..6d532389 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Slider { id: control diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index 14a6ea52..824ce061 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.SpinBox { id: control diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml index 5da0c541..3e416b87 100644 --- a/src/imports/controls/StackView.qml +++ b/src/imports/controls/StackView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T T.StackView { id: control diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index 146c357b..37d66bb6 100644 --- a/src/imports/controls/SwipeDelegate.qml +++ b/src/imports/controls/SwipeDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.SwipeDelegate { id: control diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml index 9665b5ca..ad242e1a 100644 --- a/src/imports/controls/SwipeView.qml +++ b/src/imports/controls/SwipeView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T T.SwipeView { id: control diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index e7987385..522d9980 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.Switch { id: control diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index 4d4602e8..0abf7641 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index eb4c0ae2..83f6b3b2 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T +import QtQuick.Templates 2.12 as T T.TabBar { id: control diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index b6a6317c..34a5a115 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.TabButton { id: control diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index ff252bba..45790e67 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.TextArea { id: control diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index aa57da81..4d9cb691 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.TextField { id: control diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index 1e73c0d6..1e07b6bf 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolBar { id: control diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 1c5b4662..63aaf893 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolButton { id: control diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml index f2de5aa9..188d0758 100644 --- a/src/imports/controls/ToolSeparator.qml +++ b/src/imports/controls/ToolSeparator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolSeparator { id: control diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml index e3af2ade..ae903e4c 100644 --- a/src/imports/controls/ToolTip.qml +++ b/src/imports/controls/ToolTip.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.ToolTip { id: control diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 0229dcf3..621f4113 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T T.Tumbler { id: control diff --git a/src/imports/controls/designer/AbstractButtonSection.qml b/src/imports/controls/designer/AbstractButtonSection.qml index 3cc50925..e8aa39c2 100644 --- a/src/imports/controls/designer/AbstractButtonSection.qml +++ b/src/imports/controls/designer/AbstractButtonSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("AbstractButton") diff --git a/src/imports/controls/designer/BusyIndicatorSpecifics.qml b/src/imports/controls/designer/BusyIndicatorSpecifics.qml index cf51efd2..7ae927fc 100644 --- a/src/imports/controls/designer/BusyIndicatorSpecifics.qml +++ b/src/imports/controls/designer/BusyIndicatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ButtonSection.qml b/src/imports/controls/designer/ButtonSection.qml index 038abab7..fef46071 100644 --- a/src/imports/controls/designer/ButtonSection.qml +++ b/src/imports/controls/designer/ButtonSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { id: section diff --git a/src/imports/controls/designer/ButtonSpecifics.qml b/src/imports/controls/designer/ButtonSpecifics.qml index 7b5d0a24..e094b9df 100644 --- a/src/imports/controls/designer/ButtonSpecifics.qml +++ b/src/imports/controls/designer/ButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/CheckBoxSpecifics.qml b/src/imports/controls/designer/CheckBoxSpecifics.qml index f11c55a1..f76aa215 100644 --- a/src/imports/controls/designer/CheckBoxSpecifics.qml +++ b/src/imports/controls/designer/CheckBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/CheckDelegateSpecifics.qml b/src/imports/controls/designer/CheckDelegateSpecifics.qml index d5c92d87..1df55e11 100644 --- a/src/imports/controls/designer/CheckDelegateSpecifics.qml +++ b/src/imports/controls/designer/CheckDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/CheckSection.qml b/src/imports/controls/designer/CheckSection.qml index 28353874..76cde03e 100644 --- a/src/imports/controls/designer/CheckSection.qml +++ b/src/imports/controls/designer/CheckSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { SectionLayout { diff --git a/src/imports/controls/designer/ComboBoxSpecifics.qml b/src/imports/controls/designer/ComboBoxSpecifics.qml index c5fc6781..8a5e33b6 100644 --- a/src/imports/controls/designer/ComboBoxSpecifics.qml +++ b/src/imports/controls/designer/ComboBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ContainerSection.qml b/src/imports/controls/designer/ContainerSection.qml index 9a31069a..896804c0 100644 --- a/src/imports/controls/designer/ContainerSection.qml +++ b/src/imports/controls/designer/ContainerSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Container") diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml index 90dd3816..7c53ac73 100644 --- a/src/imports/controls/designer/ControlSection.qml +++ b/src/imports/controls/designer/ControlSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Control") diff --git a/src/imports/controls/designer/ControlSpecifics.qml b/src/imports/controls/designer/ControlSpecifics.qml index 1eef1c68..ccfd8853 100644 --- a/src/imports/controls/designer/ControlSpecifics.qml +++ b/src/imports/controls/designer/ControlSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/DelayButtonSpecifics.qml b/src/imports/controls/designer/DelayButtonSpecifics.qml index 3821edc2..40b673a1 100644 --- a/src/imports/controls/designer/DelayButtonSpecifics.qml +++ b/src/imports/controls/designer/DelayButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/DialSpecifics.qml b/src/imports/controls/designer/DialSpecifics.qml index 6c9bda34..c338fa94 100644 --- a/src/imports/controls/designer/DialSpecifics.qml +++ b/src/imports/controls/designer/DialSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/FrameSpecifics.qml b/src/imports/controls/designer/FrameSpecifics.qml index 8b2cd97d..f17b6399 100644 --- a/src/imports/controls/designer/FrameSpecifics.qml +++ b/src/imports/controls/designer/FrameSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/GroupBoxSpecifics.qml b/src/imports/controls/designer/GroupBoxSpecifics.qml index 59b3299d..3a705bcc 100644 --- a/src/imports/controls/designer/GroupBoxSpecifics.qml +++ b/src/imports/controls/designer/GroupBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ItemDelegateSection.qml b/src/imports/controls/designer/ItemDelegateSection.qml index 6f466439..a337bcee 100644 --- a/src/imports/controls/designer/ItemDelegateSection.qml +++ b/src/imports/controls/designer/ItemDelegateSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { id: section diff --git a/src/imports/controls/designer/ItemDelegateSpecifics.qml b/src/imports/controls/designer/ItemDelegateSpecifics.qml index 6efb1bdc..58063980 100644 --- a/src/imports/controls/designer/ItemDelegateSpecifics.qml +++ b/src/imports/controls/designer/ItemDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/imports/controls/designer/LabelSpecifics.qml index 48cf8d05..c832f894 100644 --- a/src/imports/controls/designer/LabelSpecifics.qml +++ b/src/imports/controls/designer/LabelSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/PaddingSection.qml b/src/imports/controls/designer/PaddingSection.qml index 2e24bd42..a7dee28e 100644 --- a/src/imports/controls/designer/PaddingSection.qml +++ b/src/imports/controls/designer/PaddingSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Padding") diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/imports/controls/designer/PageIndicatorSpecifics.qml index f8bf09d4..042672a9 100644 --- a/src/imports/controls/designer/PageIndicatorSpecifics.qml +++ b/src/imports/controls/designer/PageIndicatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/PageSpecifics.qml b/src/imports/controls/designer/PageSpecifics.qml index 32feedd7..2dca1100 100644 --- a/src/imports/controls/designer/PageSpecifics.qml +++ b/src/imports/controls/designer/PageSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/PaneSection.qml b/src/imports/controls/designer/PaneSection.qml index 57aa53ae..80d154c9 100644 --- a/src/imports/controls/designer/PaneSection.qml +++ b/src/imports/controls/designer/PaneSection.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Section { caption: qsTr("Pane") diff --git a/src/imports/controls/designer/PaneSpecifics.qml b/src/imports/controls/designer/PaneSpecifics.qml index 8b2cd97d..f17b6399 100644 --- a/src/imports/controls/designer/PaneSpecifics.qml +++ b/src/imports/controls/designer/PaneSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ProgressBarSpecifics.qml b/src/imports/controls/designer/ProgressBarSpecifics.qml index fb1eb838..c24d71db 100644 --- a/src/imports/controls/designer/ProgressBarSpecifics.qml +++ b/src/imports/controls/designer/ProgressBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RadioButtonSpecifics.qml b/src/imports/controls/designer/RadioButtonSpecifics.qml index 671218a8..6137ad8c 100644 --- a/src/imports/controls/designer/RadioButtonSpecifics.qml +++ b/src/imports/controls/designer/RadioButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RadioDelegateSpecifics.qml b/src/imports/controls/designer/RadioDelegateSpecifics.qml index 6efb1bdc..58063980 100644 --- a/src/imports/controls/designer/RadioDelegateSpecifics.qml +++ b/src/imports/controls/designer/RadioDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RangeSliderSpecifics.qml b/src/imports/controls/designer/RangeSliderSpecifics.qml index d1a81512..79d2404f 100644 --- a/src/imports/controls/designer/RangeSliderSpecifics.qml +++ b/src/imports/controls/designer/RangeSliderSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/RoundButtonSpecifics.qml b/src/imports/controls/designer/RoundButtonSpecifics.qml index 1c1eed43..2da4cda6 100644 --- a/src/imports/controls/designer/RoundButtonSpecifics.qml +++ b/src/imports/controls/designer/RoundButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ScrollViewSpecifics.qml b/src/imports/controls/designer/ScrollViewSpecifics.qml index 4ce7668a..0f3d56d2 100644 --- a/src/imports/controls/designer/ScrollViewSpecifics.qml +++ b/src/imports/controls/designer/ScrollViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml index 08a3f868..076d8a1c 100644 --- a/src/imports/controls/designer/SliderSpecifics.qml +++ b/src/imports/controls/designer/SliderSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SpinBoxSpecifics.qml b/src/imports/controls/designer/SpinBoxSpecifics.qml index 335b15db..d6375d7c 100644 --- a/src/imports/controls/designer/SpinBoxSpecifics.qml +++ b/src/imports/controls/designer/SpinBoxSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/StackViewSpecifics.qml b/src/imports/controls/designer/StackViewSpecifics.qml index 1eef1c68..ccfd8853 100644 --- a/src/imports/controls/designer/StackViewSpecifics.qml +++ b/src/imports/controls/designer/StackViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwipeDelegateSpecifics.qml b/src/imports/controls/designer/SwipeDelegateSpecifics.qml index 6efb1bdc..58063980 100644 --- a/src/imports/controls/designer/SwipeDelegateSpecifics.qml +++ b/src/imports/controls/designer/SwipeDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwipeViewSpecifics.qml b/src/imports/controls/designer/SwipeViewSpecifics.qml index ac91880c..02cc900e 100644 --- a/src/imports/controls/designer/SwipeViewSpecifics.qml +++ b/src/imports/controls/designer/SwipeViewSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwitchDelegateSpecifics.qml b/src/imports/controls/designer/SwitchDelegateSpecifics.qml index c71cb13d..f8c0dcc6 100644 --- a/src/imports/controls/designer/SwitchDelegateSpecifics.qml +++ b/src/imports/controls/designer/SwitchDelegateSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/SwitchSpecifics.qml b/src/imports/controls/designer/SwitchSpecifics.qml index 671218a8..6137ad8c 100644 --- a/src/imports/controls/designer/SwitchSpecifics.qml +++ b/src/imports/controls/designer/SwitchSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TabBarSpecifics.qml b/src/imports/controls/designer/TabBarSpecifics.qml index 7a4984a1..f17e8e9a 100644 --- a/src/imports/controls/designer/TabBarSpecifics.qml +++ b/src/imports/controls/designer/TabBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TabButtonSpecifics.qml b/src/imports/controls/designer/TabButtonSpecifics.qml index 671218a8..6137ad8c 100644 --- a/src/imports/controls/designer/TabButtonSpecifics.qml +++ b/src/imports/controls/designer/TabButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml index e8bed83d..a14584e7 100644 --- a/src/imports/controls/designer/TextAreaSpecifics.qml +++ b/src/imports/controls/designer/TextAreaSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/imports/controls/designer/TextFieldSpecifics.qml index 5faeb914..67a63ec4 100644 --- a/src/imports/controls/designer/TextFieldSpecifics.qml +++ b/src/imports/controls/designer/TextFieldSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ToolBarSpecifics.qml b/src/imports/controls/designer/ToolBarSpecifics.qml index 9c0a3da1..acf02e7b 100644 --- a/src/imports/controls/designer/ToolBarSpecifics.qml +++ b/src/imports/controls/designer/ToolBarSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ToolButtonSpecifics.qml b/src/imports/controls/designer/ToolButtonSpecifics.qml index 7b5d0a24..e094b9df 100644 --- a/src/imports/controls/designer/ToolButtonSpecifics.qml +++ b/src/imports/controls/designer/ToolButtonSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/ToolSeparatorSpecifics.qml b/src/imports/controls/designer/ToolSeparatorSpecifics.qml index 0bf088c7..d0ebd57c 100644 --- a/src/imports/controls/designer/ToolSeparatorSpecifics.qml +++ b/src/imports/controls/designer/ToolSeparatorSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.3 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/designer/TumblerSpecifics.qml b/src/imports/controls/designer/TumblerSpecifics.qml index 0f1b2a74..04507ef6 100644 --- a/src/imports/controls/designer/TumblerSpecifics.qml +++ b/src/imports/controls/designer/TumblerSpecifics.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick 2.12 import HelperWidgets 2.0 -import QtQuick.Layouts 1.0 +import QtQuick.Layouts 1.12 Column { width: parent.width diff --git a/src/imports/controls/doc/qtquickcontrols.qdocconf b/src/imports/controls/doc/qtquickcontrols.qdocconf index b308b2da..9536b428 100644 --- a/src/imports/controls/doc/qtquickcontrols.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols.qdocconf @@ -41,7 +41,7 @@ exampledirs += ../../../../examples/quickcontrols2 \ examples.fileextensions += "*.conf" -examplesinstallpath = quickcontrols +examplesinstallpath = quickcontrols2 headerdirs += ../../../quicktemplates2 \ ../../../quickcontrols2 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml index 1913e131..11c7e802 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-action.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { //! [action] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml index ad92acfc..93ba9c44 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 BusyIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml index f1cd4fb9..3145a6ef 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml index 32b0797a..f6559376 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml index 870da262..bc99bba7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { text: "Button" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml index fe871639..1ff1f0a8 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textonly.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { text: "Button" diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml index ed2a6621..806655a3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml index 985e6219..a32e9f5f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-group.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Column { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml index aa19ff14..b8fbbf69 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml index 68e7ddad..1bb68bdf 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ComboBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml index 66b1fa77..86c6a0b7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-delaybutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 DelayButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml index 434386f1..0221350d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dial { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml index af03744d..c8a71e5b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml index b43ce506..be0e6f02 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog-modeless.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml index f71371f8..2953c371 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialog.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: dialog.implicitWidth diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml index 8e437957..f71f91cb 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] DialogButtonBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml index 248de50d..adfd8035 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-dialogbuttonbox.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] DialogButtonBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml index 2c57ef13..0e90f0aa 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Frame { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml index d91d684e..8f8f9c23 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-frame.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] Frame { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml index bf5d4556..5f6ee591 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-checkable.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml index afefd3d8..7ccb55c3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 GroupBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml index 90d34bde..67c68cf3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] GroupBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml index e19d28f3..d6ec5f78 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ItemDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml index 7965776b..8f483ed9 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] ListView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml index 4d960708..e984fc71 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Label { text: qsTr("Label") diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml index baa43f53..fb68bb04 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-label.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Label { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml index a9107b1c..5191efce 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-accent.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml index 472b2b39..cdbc16cc 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-background.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml index 0bf01a46..e15bc216 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-elevation.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { contentWidth: 120 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml index 01d2a1df..003b5624 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-foreground.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 4 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml index 717491a2..955290fd 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-theme.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml index fc2be179..ce8a0356 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-material-variant.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Layouts 1.12 Pane { implicitWidth: 400 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml index 2d05b74a..5a702b9f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml index 513ad440..ea27acf6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml index 550680f6..87371877 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menubar.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [begin] ApplicationWindow { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml index ba2c59a8..ea2d6ae7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml index d59b337e..0712c5fa 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-menuseparator.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: window diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml index 211697e0..8913e5bd 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.2 Item { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml index 783f611e..96fb606f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-overlay-modeless.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.2 Item { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml index ff97aa2f..7f828d93 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 PageIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml index 9f14cc0b..0a40c8b0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml @@ -25,7 +25,7 @@ ** ****************************************************************************/ -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Pane { //! [1] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml index 70182276..0eeec4d8 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator.qml @@ -24,8 +24,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] PageIndicator { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml index b2bb7ad4..dfe2eaa4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Pane { background: Rectangle { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml index baedbb53..9ed7a5b4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pane.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [1] Pane { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml index 8c1976d4..9408cd66 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.2 Item { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml index 593058c6..6d46b810 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-popup.qml @@ -26,7 +26,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 +import QtQuick.Controls 2.12 Item { //! [centerIn] diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml index 05384845..e23c1438 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ProgressBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml index 6d77772d..1361f09e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml index d486943d..27ad9da2 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml index d66850c6..1c5db214 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RangeSlider { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml index 55065125..4f727344 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-roundbutton.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] RoundButton { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml index 64a3a44b..a4a66e93 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-active.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml index 611e8f19..5efcb461 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml index ff02a344..43e2853e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-non-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml index fdcef987..942722a5 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-policy.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Flickable { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml index ce26e4a3..6cb749e6 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-active.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml index dba2f566..616c877d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollIndicator { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml index f4dcc21a..f1b99bca 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-non-attached.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml index 0d5686f3..9010f0af 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-custom.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml index 9770de33..26b0b5c4 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-interactive.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [file] ScrollView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml index b3eff14f..6907d674 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-listview.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml index efd23100..f5c33975 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview-policy.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [file] ScrollView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml index 74c0e85c..cbdf9eb8 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollview.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Rectangle { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml index 26c73462..7745892d 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Slider { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml index ab5ee1f3..ad05d463 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SpinBox { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml index d8ae971d..6f1bb55b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-double.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml index 1943746a..daa54967 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-textual.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml index 9eeb9017..32d39b9f 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SpinBox { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml index 5faff67b..cfeab812 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 StackView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml index c80b6e4d..a9298460 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-stackview-visible.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] StackView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml index 4159e7f7..432fcc87 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml index a6936fe8..6b71a5f0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-transition.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] SwipeDelegate { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml index 7fa76f13..6e02c057 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] ListView { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml index d0303f9f..40833dde 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeView { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml index 6a612767..1869a032 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipeview-indicator.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 200 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml index 51e6b0c2..a7dd2eea 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Switch { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml index 726614d8..19060824 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwitchDelegate { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml index 0aa275a7..c06c44c7 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TabBar { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml index 611195ea..01f0d875 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-explicit.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 360 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml index 0c175f3b..628aef80 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar-flickable.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 360 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml index bf8595b1..cbf6d728 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbar.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Column { width: 300 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml index bfc8ac34..0aae7d15 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tabbutton.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] TabBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml index dc89d9cd..3ce856ac 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextArea { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml index 3a9aa2c5..e16c6bbf 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-scrollable.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { width: 100 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml index b7987abd..e48e0d65 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml index d7b06ab1..18634d5e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-disabled.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml index f66a9245..5d8e067b 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-focused.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml index 0ff83b67..b0a04674 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-normal.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { width: 80 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml index cbb08f23..3d26e510 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-custom.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 //! [file] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml index baa970f9..e1c8c580 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 Item { width: children[0].implicitWidth * 2 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml index e49c6dfe..cf5bc70e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolButton { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml index 7071a31b..e26986cc 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator-custom.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 //! [file] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml index 52300550..2ccfb439 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-toolseparator.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 //! [1] ToolBar { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml index d53e3f9e..6a0a5b38 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { ToolTip { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml index 06af3f60..812b5ba2 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-hover.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Button { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml index a571d728..927d29c3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-pressandhold.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [1] Button { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml index 9e5d991a..508a417e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-slider.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml index fe96cea6..a4e92f88 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Item { id: root diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml index cc37d541..ee054106 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-custom.qml @@ -26,8 +26,8 @@ ****************************************************************************/ //! [file] -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Tumbler { id: control diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml index b46aa129..7d16d139 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-listView.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [contentItem] Tumbler { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml index 627806d2..61e4ce01 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-pathView.qml @@ -25,8 +25,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 //! [contentItem] Tumbler { diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml index 52c3efdd..13130f97 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-timePicker.qml @@ -26,9 +26,9 @@ ****************************************************************************/ //! [tumbler] -import QtQuick 2.8 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Rectangle { width: frame.implicitWidth + 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml index 322dbf42..c54a18a0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-accent.qml @@ -25,10 +25,10 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml index d73f98a9..f22b5308 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-background.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml index 8b71f25f..8c5b99a3 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-foreground.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml index 1885876d..1f0d6bd0 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-universal-theme.qml @@ -25,9 +25,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 Pane { padding: 10 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc index a907f532..a846f607 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc @@ -28,7 +28,8 @@ /*! \page qtquickcontrols2-configuration.html \keyword Qt Quick Controls Configuration File - \title Qt Quick Controls 2 Configuration File + \title Qt Quick Controls Configuration File + \keyword Qt Quick Controls 2 Configuration File Qt Quick Controls 2 support a special configuration file, \c :/qtquickcontrols2.conf, that is built into an application's resources. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc index 1397e974..4a8ecfea 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-cppclasses.qdoc @@ -28,7 +28,8 @@ /*! \module QtQuickControls2 \keyword Qt Quick Controls C++ Classes - \title Qt Quick Controls 2 C++ Classes + \title Qt Quick Controls C++ Classes + \keyword Qt Quick Controls 2 C++ Classes \ingroup modules \qtvariable quickcontrols2 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index de13be9d..958cc358 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -47,9 +47,9 @@ can override the \l {Control::}{background} item and set the radius property of Rectangle: - \qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { width: 400 @@ -91,8 +91,8 @@ module itself, we'll call the file \c MyButton.qml. To use the control in your application, refer to it by its filename: - \qml - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick.Controls 2.\1 ApplicationWindow { MyButton { @@ -107,8 +107,8 @@ subfolder in your project named (for example) \c controls. To use the control, first import the folder into a namespace: - \qml - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick.Controls 2.\1 import "controls" as MyControls ApplicationWindow { @@ -328,9 +328,9 @@ Next, we add a drop shadow to the \l {Control::}{background} delegate of the Button: - \code + \code \QtMinorVersion // ... - import QtGraphicalEffects 1.0 + import QtGraphicalEffects 1.\1 import MyStyle 1.0 // ... @@ -359,9 +359,9 @@ To try out the attached property, we create a \l Row with two Buttons in \c main.qml: - \qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 import MyStyle 1.0 @@ -416,9 +416,9 @@ to customize the \l {ApplicationWindow::overlay}{modal} and \l {ApplicationWindow::overlay}{modeless} items. - \code - import QtQuick 2.7 - import QtQuick.Controls 2.0 + \code \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { visible: true @@ -580,8 +580,8 @@ \image qtquickcontrols2-menu-custom.png \quotefromfile qtquickcontrols2-menu-custom.qml - \skipto import QtQuick 2.10 - \printuntil import QtQuick.Controls 2.3 + \skipto import QtQuick + \printuntil import QtQuick.Controls \skipto Menu \printto eof @@ -595,8 +595,8 @@ \image qtquickcontrols2-menubar-custom.png \quotefromfile qtquickcontrols2-menubar-custom.qml - \skipto import QtQuick 2.10 - \printuntil import QtQuick.Controls 2.3 + \skipto import QtQuick + \printuntil import QtQuick.Controls \skipto MenuBar \printto eof @@ -627,8 +627,8 @@ \image qtquickcontrols2-popup-custom.png \quotefromfile qtquickcontrols2-popup-custom.qml - \skipto import QtQuick 2.6 - \printuntil import QtQuick.Controls 2.0 + \skipto import QtQuick 2.12 + \printuntil import QtQuick.Controls 2.12 \codeline \skipto Popup \printuntil { @@ -862,8 +862,8 @@ and \l {Popup::contentItem}{content item}. \quotefromfile qtquickcontrols2-tooltip-custom.qml - \skipto import QtQuick 2.6 - \printuntil import QtQuick.Controls 2.1 + \skipto import QtQuick + \printuntil import QtQuick.Controls \skipto ToolTip \printuntil } \printuntil } diff --git a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc index e10037df..b828f32c 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-examples.qdoc @@ -29,7 +29,8 @@ \group qtquickcontrols2-examples \ingroup all-examples \keyword Qt Quick Controls Examples - \title Qt Quick Controls 2 Examples + \title Qt Quick Controls Examples + \keyword Qt Quick Controls 2 Examples \brief A collection of examples for \l {Qt Quick Controls 2} These examples demonstrate creating user interfaces using \l {Qt Quick Controls 2}. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc index afe5611f..cfcfa149 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc @@ -59,10 +59,10 @@ \c material selector will be present and the \c +material/CustomButton.qml version will be used instead. - \code + \code \QtMinorVersion // main.qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { id: window @@ -78,10 +78,10 @@ The base implementation of the custom button is a simple rounded flat button. - \code + \code \QtMinorVersion // CustomButton.qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 Button { id: control @@ -99,12 +99,12 @@ Material style, requests a dark theme to get light text, and creates a drop shadow for the background. - \code + \code \QtMinorVersion // +material/CustomButton.qml - import QtQuick 2.6 - import QtGraphicalEffects 1.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Material 2.1 + import QtQuick 2.\1 + import QtGraphicalEffects 1.\1 + import QtQuick.Controls 2.\1 + import QtQuick.Controls.Material 2.\1 Button { id: control diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc index 4708a4be..043aaed2 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc @@ -62,8 +62,8 @@ \row \li \qml - import QtQuick 2.7 - import QtQuick.Controls 2.3 + import QtQuick 2.12 + import QtQuick.Controls 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc index fe3f27a9..fecad927 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-gettingstarted.qdoc @@ -31,9 +31,9 @@ A basic example of a QML file that makes use of controls is shown here: - \qml - import QtQuick 2.6 - import QtQuick.Controls 2.1 + \qml \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { title: "My Application" diff --git a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc index 24a5be62..034ed0f9 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc @@ -28,7 +28,8 @@ /*! \page qtquickcontrols2-guidelines.html \keyword Qt Quick Controls Guidelines - \title Qt Quick Controls 2 Guidelines + \title Qt Quick Controls Guidelines + \keyword Qt Quick Controls 2 Guidelines Qt Quick Controls 2 offers a selection of controls that can be used to build complete interfaces in Qt Quick. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc index f24f82a9..c7ad71cf 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-imagine.qdoc @@ -31,7 +31,7 @@ The Imagine Style is based on configurable image assets. \l{detailed-desc-imagine}{More...} - \styleimport {QtQuick.Controls.Imagine 2.5} {Qt 5.10} + \styleimport {QtQuick.Controls.Imagine 2.12} {Qt 5.10} \section1 Attached Properties @@ -2431,9 +2431,9 @@ \row \li \qml - import QtQuick 2.0 - import QtQuick.Controls 2.3 - import QtQuick.Controls.Imagine 2.3 + import QtQuick 2.12 + import QtQuick.Controls 2.12 + import QtQuick.Controls.Imagine 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 651336ed..f95db512 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -27,8 +27,8 @@ /*! \page qtquickcontrols-index.html - \keyword Qt Quick Controls - \title Qt Quick Controls 2 + \keyword Qt Quick Controls 2 + \title Qt Quick Controls \brief Provides a set of UI controls for Qt Quick. @@ -46,8 +46,8 @@ The \l{Qt Quick Controls 2 QML Types}{QML types} can be imported into your application using the following import statement in your \c {.qml} file: - \code - import QtQuick.Controls 2.5 + \code \QtMinorVersion + import QtQuick.Controls 2.\1 \endcode The \l{Qt Quick Controls 2 C++ Classes}{C++ classes} can be included into @@ -78,7 +78,8 @@ \section1 Versions Qt Quick Controls 2.0 was introduced in Qt 5.7. Subsequent minor Qt releases - increment the import version of the Qt Quick Controls 2 modules by one. The + increment the import version of the Qt Quick Controls 2 modules by one, + until Qt 5.12, where the import versions match Qt's minor version. The experimental Qt Labs modules use import version 1.0. \table @@ -119,7 +120,7 @@ \row \li 5.12 \li 2.12 - \li 2.5 + \li 2.12 \li 1.0 \row \li ... diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index fa7874e5..d9e34a5f 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -32,7 +32,7 @@ The Material Style is based on the Google Material Design Guidelines. \l{detailed-desc-material}{More...} - \styleimport {QtQuick.Controls.Material 2.5} {Qt 5.7} + \styleimport {QtQuick.Controls.Material 2.12} {Qt 5.7} \section1 Attached Properties @@ -93,9 +93,9 @@ \row \li \qml - import QtQuick 2.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Material 2.1 + import QtQuick 2.12 + import QtQuick.Controls 2.12 + import QtQuick.Controls.Material 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index 5f0f704c..a28b2974 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -28,7 +28,8 @@ /*! \qmlmodule QtQuick.Controls 2.5 \keyword Qt Quick Controls QML Types - \title Qt Quick Controls 2 QML Types + \title Qt Quick Controls QML Types + \keyword Qt Quick Controls 2 QML Types \ingroup qmlmodules \brief Provides QML types for user interfaces (Qt Quick Controls 2). @@ -39,8 +40,8 @@ Qt Quick Controls 2 QML types can be imported into your application using the following import statement in your .qml file: - \badcode - import QtQuick.Controls 2.5 + \badcode \QtMinorVersion + import QtQuick.Controls 2.\1 \endcode \section1 QML Types diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 80bf9ef7..f1bfb1c8 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -32,7 +32,7 @@ The Universal Style is based on the Microsoft Universal Design Guidelines. \l {detailed-desc-universal}{More...} - \styleimport {QtQuick.Controls.Universal 2.5} {Qt 5.7} + \styleimport {QtQuick.Controls.Universal 2.12} {Qt 5.7} \section1 Attached Properties @@ -92,9 +92,9 @@ \row \li \qml - import QtQuick 2.0 - import QtQuick.Controls 2.1 - import QtQuick.Controls.Universal 2.1 + import QtQuick 2.12 + import QtQuick.Controls 2.12 + import QtQuick.Controls.Universal 2.12 ApplicationWindow { visible: true diff --git a/src/imports/controls/fusion/ApplicationWindow.qml b/src/imports/controls/fusion/ApplicationWindow.qml index 6abe832f..9079403e 100644 --- a/src/imports/controls/fusion/ApplicationWindow.qml +++ b/src/imports/controls/fusion/ApplicationWindow.qml @@ -36,9 +36,9 @@ import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/fusion/BusyIndicator.qml b/src/imports/controls/fusion/BusyIndicator.qml index 7afff2df..554c3368 100644 --- a/src/imports/controls/fusion/BusyIndicator.qml +++ b/src/imports/controls/fusion/BusyIndicator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/fusion/Button.qml b/src/imports/controls/fusion/Button.qml index ca6d81a9..7822634d 100644 --- a/src/imports/controls/fusion/Button.qml +++ b/src/imports/controls/fusion/Button.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Button { id: control diff --git a/src/imports/controls/fusion/ButtonPanel.qml b/src/imports/controls/fusion/ButtonPanel.qml index fc1af2de..3250044b 100644 --- a/src/imports/controls/fusion/ButtonPanel.qml +++ b/src/imports/controls/fusion/ButtonPanel.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: panel diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/imports/controls/fusion/CheckBox.qml index 9b9dba18..f90c80fb 100644 --- a/src/imports/controls/fusion/CheckBox.qml +++ b/src/imports/controls/fusion/CheckBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/fusion/CheckDelegate.qml b/src/imports/controls/fusion/CheckDelegate.qml index 40f68164..1b97b1fd 100644 --- a/src/imports/controls/fusion/CheckDelegate.qml +++ b/src/imports/controls/fusion/CheckDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/fusion/CheckIndicator.qml b/src/imports/controls/fusion/CheckIndicator.qml index 8c49e6b2..314a6798 100644 --- a/src/imports/controls/fusion/CheckIndicator.qml +++ b/src/imports/controls/fusion/CheckIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: indicator diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index cafbdb02..3ecb0cf2 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -35,12 +35,12 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ComboBox { id: control @@ -57,6 +57,7 @@ T.ComboBox { delegate: MenuItem { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled } diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/imports/controls/fusion/DelayButton.qml index c150bb2e..622de111 100644 --- a/src/imports/controls/fusion/DelayButton.qml +++ b/src/imports/controls/fusion/DelayButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.DelayButton { id: control diff --git a/src/imports/controls/fusion/Dial.qml b/src/imports/controls/fusion/Dial.qml index fb248d5e..423087c9 100644 --- a/src/imports/controls/fusion/Dial.qml +++ b/src/imports/controls/fusion/Dial.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Dial { id: control diff --git a/src/imports/controls/fusion/Dialog.qml b/src/imports/controls/fusion/Dialog.qml index a079d09f..79e179d9 100644 --- a/src/imports/controls/fusion/Dialog.qml +++ b/src/imports/controls/fusion/Dialog.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/fusion/DialogButtonBox.qml b/src/imports/controls/fusion/DialogButtonBox.qml index 49446c31..a0b0f243 100644 --- a/src/imports/controls/fusion/DialogButtonBox.qml +++ b/src/imports/controls/fusion/DialogButtonBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/fusion/Drawer.qml b/src/imports/controls/fusion/Drawer.qml index f0ee0200..5a23dde1 100644 --- a/src/imports/controls/fusion/Drawer.qml +++ b/src/imports/controls/fusion/Drawer.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Drawer { id: control diff --git a/src/imports/controls/fusion/Frame.qml b/src/imports/controls/fusion/Frame.qml index ffe816b4..c2df6351 100644 --- a/src/imports/controls/fusion/Frame.qml +++ b/src/imports/controls/fusion/Frame.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Frame { id: control diff --git a/src/imports/controls/fusion/GroupBox.qml b/src/imports/controls/fusion/GroupBox.qml index 11372556..3df3e1e6 100644 --- a/src/imports/controls/fusion/GroupBox.qml +++ b/src/imports/controls/fusion/GroupBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/fusion/ItemDelegate.qml b/src/imports/controls/fusion/ItemDelegate.qml index 407078dd..4c15ae68 100644 --- a/src/imports/controls/fusion/ItemDelegate.qml +++ b/src/imports/controls/fusion/ItemDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/fusion/Label.qml b/src/imports/controls/fusion/Label.qml index 23e337e2..9821f71c 100644 --- a/src/imports/controls/fusion/Label.qml +++ b/src/imports/controls/fusion/Label.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Label { id: control diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml index fd64ed45..e06b70fd 100644 --- a/src/imports/controls/fusion/Menu.qml +++ b/src/imports/controls/fusion/Menu.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/fusion/MenuBar.qml b/src/imports/controls/fusion/MenuBar.qml index 81aaf9b5..4ba71fee 100644 --- a/src/imports/controls/fusion/MenuBar.qml +++ b/src/imports/controls/fusion/MenuBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/fusion/MenuBarItem.qml b/src/imports/controls/fusion/MenuBarItem.qml index 85330a73..9fa685dc 100644 --- a/src/imports/controls/fusion/MenuBarItem.qml +++ b/src/imports/controls/fusion/MenuBarItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/fusion/MenuItem.qml b/src/imports/controls/fusion/MenuItem.qml index b8ebd5e6..a428fbc8 100644 --- a/src/imports/controls/fusion/MenuItem.qml +++ b/src/imports/controls/fusion/MenuItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/fusion/MenuSeparator.qml b/src/imports/controls/fusion/MenuSeparator.qml index 904a15ef..522ada15 100644 --- a/src/imports/controls/fusion/MenuSeparator.qml +++ b/src/imports/controls/fusion/MenuSeparator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/fusion/Page.qml b/src/imports/controls/fusion/Page.qml index 13f92c7a..796dff1c 100644 --- a/src/imports/controls/fusion/Page.qml +++ b/src/imports/controls/fusion/Page.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Page { id: control diff --git a/src/imports/controls/fusion/PageIndicator.qml b/src/imports/controls/fusion/PageIndicator.qml index fb3a5b89..5679b14f 100644 --- a/src/imports/controls/fusion/PageIndicator.qml +++ b/src/imports/controls/fusion/PageIndicator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/fusion/Pane.qml b/src/imports/controls/fusion/Pane.qml index 53d51bf7..69fbdca0 100644 --- a/src/imports/controls/fusion/Pane.qml +++ b/src/imports/controls/fusion/Pane.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Pane { id: control diff --git a/src/imports/controls/fusion/Popup.qml b/src/imports/controls/fusion/Popup.qml index 93c7afd3..25a8c5ae 100644 --- a/src/imports/controls/fusion/Popup.qml +++ b/src/imports/controls/fusion/Popup.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Popup { id: control diff --git a/src/imports/controls/fusion/ProgressBar.qml b/src/imports/controls/fusion/ProgressBar.qml index 4e31d611..5deade58 100644 --- a/src/imports/controls/fusion/ProgressBar.qml +++ b/src/imports/controls/fusion/ProgressBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/imports/controls/fusion/RadioButton.qml index ef574201..fed6fa7c 100644 --- a/src/imports/controls/fusion/RadioButton.qml +++ b/src/imports/controls/fusion/RadioButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/fusion/RadioDelegate.qml b/src/imports/controls/fusion/RadioDelegate.qml index ddcb1217..e8555a17 100644 --- a/src/imports/controls/fusion/RadioDelegate.qml +++ b/src/imports/controls/fusion/RadioDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/fusion/RadioIndicator.qml b/src/imports/controls/fusion/RadioIndicator.qml index 790a5e24..4b67d24e 100644 --- a/src/imports/controls/fusion/RadioIndicator.qml +++ b/src/imports/controls/fusion/RadioIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: indicator diff --git a/src/imports/controls/fusion/RangeSlider.qml b/src/imports/controls/fusion/RangeSlider.qml index 17f4c62b..7edbed57 100644 --- a/src/imports/controls/fusion/RangeSlider.qml +++ b/src/imports/controls/fusion/RangeSlider.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/fusion/RoundButton.qml b/src/imports/controls/fusion/RoundButton.qml index a38d123f..59bf4c16 100644 --- a/src/imports/controls/fusion/RoundButton.qml +++ b/src/imports/controls/fusion/RoundButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.RoundButton { id: control diff --git a/src/imports/controls/fusion/ScrollBar.qml b/src/imports/controls/fusion/ScrollBar.qml index 154f540b..e4fb7949 100644 --- a/src/imports/controls/fusion/ScrollBar.qml +++ b/src/imports/controls/fusion/ScrollBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ScrollBar { id: control diff --git a/src/imports/controls/fusion/ScrollIndicator.qml b/src/imports/controls/fusion/ScrollIndicator.qml index 3f8668c5..efe0b2fa 100644 --- a/src/imports/controls/fusion/ScrollIndicator.qml +++ b/src/imports/controls/fusion/ScrollIndicator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ScrollIndicator { id: control diff --git a/src/imports/controls/fusion/Slider.qml b/src/imports/controls/fusion/Slider.qml index 67ee73cc..d212a233 100644 --- a/src/imports/controls/fusion/Slider.qml +++ b/src/imports/controls/fusion/Slider.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Slider { id: control diff --git a/src/imports/controls/fusion/SliderGroove.qml b/src/imports/controls/fusion/SliderGroove.qml index 678ac8c2..c34217a8 100644 --- a/src/imports/controls/fusion/SliderGroove.qml +++ b/src/imports/controls/fusion/SliderGroove.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: groove diff --git a/src/imports/controls/fusion/SliderHandle.qml b/src/imports/controls/fusion/SliderHandle.qml index 9bfa45a1..c53af57e 100644 --- a/src/imports/controls/fusion/SliderHandle.qml +++ b/src/imports/controls/fusion/SliderHandle.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: handle diff --git a/src/imports/controls/fusion/SpinBox.qml b/src/imports/controls/fusion/SpinBox.qml index 5ef01d8f..fd77f9f3 100644 --- a/src/imports/controls/fusion/SpinBox.qml +++ b/src/imports/controls/fusion/SpinBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.SpinBox { id: control diff --git a/src/imports/controls/fusion/SwipeDelegate.qml b/src/imports/controls/fusion/SwipeDelegate.qml index c5de54a8..48c531ea 100644 --- a/src/imports/controls/fusion/SwipeDelegate.qml +++ b/src/imports/controls/fusion/SwipeDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.SwipeDelegate { id: control diff --git a/src/imports/controls/fusion/Switch.qml b/src/imports/controls/fusion/Switch.qml index 6406ba64..edcb3650 100644 --- a/src/imports/controls/fusion/Switch.qml +++ b/src/imports/controls/fusion/Switch.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Switch { id: control diff --git a/src/imports/controls/fusion/SwitchDelegate.qml b/src/imports/controls/fusion/SwitchDelegate.qml index 6f07731e..0db13b41 100644 --- a/src/imports/controls/fusion/SwitchDelegate.qml +++ b/src/imports/controls/fusion/SwitchDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/fusion/SwitchIndicator.qml b/src/imports/controls/fusion/SwitchIndicator.qml index 7948a794..f89388c7 100644 --- a/src/imports/controls/fusion/SwitchIndicator.qml +++ b/src/imports/controls/fusion/SwitchIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 Rectangle { id: indicator diff --git a/src/imports/controls/fusion/TabBar.qml b/src/imports/controls/fusion/TabBar.qml index 3797e573..233a2acd 100644 --- a/src/imports/controls/fusion/TabBar.qml +++ b/src/imports/controls/fusion/TabBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TabBar { id: control diff --git a/src/imports/controls/fusion/TabButton.qml b/src/imports/controls/fusion/TabButton.qml index 201e7763..136503b6 100644 --- a/src/imports/controls/fusion/TabButton.qml +++ b/src/imports/controls/fusion/TabButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TabButton { id: control diff --git a/src/imports/controls/fusion/TextArea.qml b/src/imports/controls/fusion/TextArea.qml index d2469d28..c7107ac4 100644 --- a/src/imports/controls/fusion/TextArea.qml +++ b/src/imports/controls/fusion/TextArea.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TextArea { id: control diff --git a/src/imports/controls/fusion/TextField.qml b/src/imports/controls/fusion/TextField.qml index 6f5f49b3..d5b5788d 100644 --- a/src/imports/controls/fusion/TextField.qml +++ b/src/imports/controls/fusion/TextField.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.TextField { id: control diff --git a/src/imports/controls/fusion/ToolBar.qml b/src/imports/controls/fusion/ToolBar.qml index d569899d..fa069c0b 100644 --- a/src/imports/controls/fusion/ToolBar.qml +++ b/src/imports/controls/fusion/ToolBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolBar { id: control diff --git a/src/imports/controls/fusion/ToolButton.qml b/src/imports/controls/fusion/ToolButton.qml index f198a18b..4c00b402 100644 --- a/src/imports/controls/fusion/ToolButton.qml +++ b/src/imports/controls/fusion/ToolButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolButton { id: control diff --git a/src/imports/controls/fusion/ToolSeparator.qml b/src/imports/controls/fusion/ToolSeparator.qml index f8047b81..5d366652 100644 --- a/src/imports/controls/fusion/ToolSeparator.qml +++ b/src/imports/controls/fusion/ToolSeparator.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolSeparator { id: control diff --git a/src/imports/controls/fusion/ToolTip.qml b/src/imports/controls/fusion/ToolTip.qml index 922789dd..73f561e4 100644 --- a/src/imports/controls/fusion/ToolTip.qml +++ b/src/imports/controls/fusion/ToolTip.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.ToolTip { id: control diff --git a/src/imports/controls/fusion/Tumbler.qml b/src/imports/controls/fusion/Tumbler.qml index fd0d7ef3..6abf7b5a 100644 --- a/src/imports/controls/fusion/Tumbler.qml +++ b/src/imports/controls/fusion/Tumbler.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Fusion 2.5 -import QtQuick.Controls.Fusion.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Fusion.impl 2.12 T.Tumbler { id: control diff --git a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp index 107b4a2d..dcba73fe 100644 --- a/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp +++ b/src/imports/controls/fusion/qtquickcontrols2fusionstyleplugin.cpp @@ -73,10 +73,10 @@ QtQuickControls2FusionStylePlugin::QtQuickControls2FusionStylePlugin(QObject *pa void QtQuickControls2FusionStylePlugin::registerTypes(const char *uri) { qmlRegisterModule(uri, 2, 3); // Qt 5.10->2.3 - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.11->2.4, 5.12->2.5... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterSingletonType<QQuickFusionStyle>(import, 2, 3, "Fusion", styleSingleton); diff --git a/src/imports/controls/imagine/ApplicationWindow.qml b/src/imports/controls/imagine/ApplicationWindow.qml index 00922f63..7bfcc3f9 100644 --- a/src/imports/controls/imagine/ApplicationWindow.qml +++ b/src/imports/controls/imagine/ApplicationWindow.qml @@ -36,9 +36,9 @@ import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/imports/controls/imagine/BusyIndicator.qml index bd90d21a..652365b1 100644 --- a/src/imports/controls/imagine/BusyIndicator.qml +++ b/src/imports/controls/imagine/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/imagine/Button.qml b/src/imports/controls/imagine/Button.qml index c8962a6b..e7171eb1 100644 --- a/src/imports/controls/imagine/Button.qml +++ b/src/imports/controls/imagine/Button.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Button { id: control diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/imports/controls/imagine/CheckBox.qml index 3f0b7684..b91ceb40 100644 --- a/src/imports/controls/imagine/CheckBox.qml +++ b/src/imports/controls/imagine/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/imagine/CheckDelegate.qml b/src/imports/controls/imagine/CheckDelegate.qml index 2336131f..19975152 100644 --- a/src/imports/controls/imagine/CheckDelegate.qml +++ b/src/imports/controls/imagine/CheckDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index 530fa378..3a3ae682 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ComboBox { id: control @@ -61,6 +61,7 @@ T.ComboBox { delegate: ItemDelegate { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled } diff --git a/src/imports/controls/imagine/DelayButton.qml b/src/imports/controls/imagine/DelayButton.qml index ef1f6511..f60b5eae 100644 --- a/src/imports/controls/imagine/DelayButton.qml +++ b/src/imports/controls/imagine/DelayButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 -import QtGraphicalEffects 1.0 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 +import QtGraphicalEffects 1.12 T.DelayButton { id: control diff --git a/src/imports/controls/imagine/Dial.qml b/src/imports/controls/imagine/Dial.qml index ac7a4645..f10634e6 100644 --- a/src/imports/controls/imagine/Dial.qml +++ b/src/imports/controls/imagine/Dial.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Dial { id: control diff --git a/src/imports/controls/imagine/Dialog.qml b/src/imports/controls/imagine/Dialog.qml index 968f70ab..730b7f57 100644 --- a/src/imports/controls/imagine/Dialog.qml +++ b/src/imports/controls/imagine/Dialog.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/imagine/DialogButtonBox.qml b/src/imports/controls/imagine/DialogButtonBox.qml index ec1cbde8..c24b29fc 100644 --- a/src/imports/controls/imagine/DialogButtonBox.qml +++ b/src/imports/controls/imagine/DialogButtonBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/imagine/Drawer.qml b/src/imports/controls/imagine/Drawer.qml index ea4f7337..2c93ba75 100644 --- a/src/imports/controls/imagine/Drawer.qml +++ b/src/imports/controls/imagine/Drawer.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Drawer { id: control diff --git a/src/imports/controls/imagine/Frame.qml b/src/imports/controls/imagine/Frame.qml index b049715b..2bef3c88 100644 --- a/src/imports/controls/imagine/Frame.qml +++ b/src/imports/controls/imagine/Frame.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Frame { id: control diff --git a/src/imports/controls/imagine/GroupBox.qml b/src/imports/controls/imagine/GroupBox.qml index 816e0c8c..7abdb6f0 100644 --- a/src/imports/controls/imagine/GroupBox.qml +++ b/src/imports/controls/imagine/GroupBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/imagine/ItemDelegate.qml b/src/imports/controls/imagine/ItemDelegate.qml index 7ec07f55..0b3edeaf 100644 --- a/src/imports/controls/imagine/ItemDelegate.qml +++ b/src/imports/controls/imagine/ItemDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/imagine/Label.qml b/src/imports/controls/imagine/Label.qml index f9a5bdb6..82c0ef47 100644 --- a/src/imports/controls/imagine/Label.qml +++ b/src/imports/controls/imagine/Label.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Label { id: control diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml index bf7540fd..20a34467 100644 --- a/src/imports/controls/imagine/Menu.qml +++ b/src/imports/controls/imagine/Menu.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/imagine/MenuItem.qml b/src/imports/controls/imagine/MenuItem.qml index 58dc344a..f85fc657 100644 --- a/src/imports/controls/imagine/MenuItem.qml +++ b/src/imports/controls/imagine/MenuItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/imagine/MenuSeparator.qml b/src/imports/controls/imagine/MenuSeparator.qml index 3821a15a..9ed39087 100644 --- a/src/imports/controls/imagine/MenuSeparator.qml +++ b/src/imports/controls/imagine/MenuSeparator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/imagine/Page.qml b/src/imports/controls/imagine/Page.qml index 2fe6a01d..07ec0a75 100644 --- a/src/imports/controls/imagine/Page.qml +++ b/src/imports/controls/imagine/Page.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Page { id: control diff --git a/src/imports/controls/imagine/PageIndicator.qml b/src/imports/controls/imagine/PageIndicator.qml index 7e9f43fe..8da89f5a 100644 --- a/src/imports/controls/imagine/PageIndicator.qml +++ b/src/imports/controls/imagine/PageIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/imagine/Pane.qml b/src/imports/controls/imagine/Pane.qml index f794666e..970b22b9 100644 --- a/src/imports/controls/imagine/Pane.qml +++ b/src/imports/controls/imagine/Pane.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Pane { id: control diff --git a/src/imports/controls/imagine/Popup.qml b/src/imports/controls/imagine/Popup.qml index 12b8300b..8f69bef4 100644 --- a/src/imports/controls/imagine/Popup.qml +++ b/src/imports/controls/imagine/Popup.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Popup { id: control diff --git a/src/imports/controls/imagine/ProgressBar.qml b/src/imports/controls/imagine/ProgressBar.qml index c809f308..2f78004e 100644 --- a/src/imports/controls/imagine/ProgressBar.qml +++ b/src/imports/controls/imagine/ProgressBar.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 -import QtGraphicalEffects 1.0 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 +import QtGraphicalEffects 1.12 T.ProgressBar { id: control diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/imports/controls/imagine/RadioButton.qml index 6ba36d8a..d431695f 100644 --- a/src/imports/controls/imagine/RadioButton.qml +++ b/src/imports/controls/imagine/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/imagine/RadioDelegate.qml b/src/imports/controls/imagine/RadioDelegate.qml index c3febde2..5a8356f8 100644 --- a/src/imports/controls/imagine/RadioDelegate.qml +++ b/src/imports/controls/imagine/RadioDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/imagine/RangeSlider.qml b/src/imports/controls/imagine/RangeSlider.qml index 5461cf01..47d90cf3 100644 --- a/src/imports/controls/imagine/RangeSlider.qml +++ b/src/imports/controls/imagine/RangeSlider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/imports/controls/imagine/RoundButton.qml index 718faad4..fe4cbb36 100644 --- a/src/imports/controls/imagine/RoundButton.qml +++ b/src/imports/controls/imagine/RoundButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.RoundButton { id: control diff --git a/src/imports/controls/imagine/ScrollBar.qml b/src/imports/controls/imagine/ScrollBar.qml index b7acf416..787ea663 100644 --- a/src/imports/controls/imagine/ScrollBar.qml +++ b/src/imports/controls/imagine/ScrollBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ScrollBar { id: control diff --git a/src/imports/controls/imagine/ScrollIndicator.qml b/src/imports/controls/imagine/ScrollIndicator.qml index fd1effa3..2fd578ef 100644 --- a/src/imports/controls/imagine/ScrollIndicator.qml +++ b/src/imports/controls/imagine/ScrollIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ScrollIndicator { id: control diff --git a/src/imports/controls/imagine/ScrollView.qml b/src/imports/controls/imagine/ScrollView.qml index 64fd3ac5..9d469ba5 100644 --- a/src/imports/controls/imagine/ScrollView.qml +++ b/src/imports/controls/imagine/ScrollView.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ScrollView { id: control diff --git a/src/imports/controls/imagine/Slider.qml b/src/imports/controls/imagine/Slider.qml index f39bab70..fe9c3388 100644 --- a/src/imports/controls/imagine/Slider.qml +++ b/src/imports/controls/imagine/Slider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Slider { id: control diff --git a/src/imports/controls/imagine/SpinBox.qml b/src/imports/controls/imagine/SpinBox.qml index 866db7fc..61135806 100644 --- a/src/imports/controls/imagine/SpinBox.qml +++ b/src/imports/controls/imagine/SpinBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.SpinBox { id: control diff --git a/src/imports/controls/imagine/StackView.qml b/src/imports/controls/imagine/StackView.qml index 302816d7..407b1d15 100644 --- a/src/imports/controls/imagine/StackView.qml +++ b/src/imports/controls/imagine/StackView.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.StackView { id: control diff --git a/src/imports/controls/imagine/SwipeDelegate.qml b/src/imports/controls/imagine/SwipeDelegate.qml index be1a378e..3850253f 100644 --- a/src/imports/controls/imagine/SwipeDelegate.qml +++ b/src/imports/controls/imagine/SwipeDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.SwipeDelegate { id: control diff --git a/src/imports/controls/imagine/SwipeView.qml b/src/imports/controls/imagine/SwipeView.qml index 6c946715..4998edb7 100644 --- a/src/imports/controls/imagine/SwipeView.qml +++ b/src/imports/controls/imagine/SwipeView.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.SwipeView { id: control diff --git a/src/imports/controls/imagine/Switch.qml b/src/imports/controls/imagine/Switch.qml index 2a144c85..7d1f3a2a 100644 --- a/src/imports/controls/imagine/Switch.qml +++ b/src/imports/controls/imagine/Switch.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Switch { id: control diff --git a/src/imports/controls/imagine/SwitchDelegate.qml b/src/imports/controls/imagine/SwitchDelegate.qml index a4f7e93e..e95023fb 100644 --- a/src/imports/controls/imagine/SwitchDelegate.qml +++ b/src/imports/controls/imagine/SwitchDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/imagine/TabBar.qml b/src/imports/controls/imagine/TabBar.qml index 20802da0..69516e03 100644 --- a/src/imports/controls/imagine/TabBar.qml +++ b/src/imports/controls/imagine/TabBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.TabBar { id: control diff --git a/src/imports/controls/imagine/TabButton.qml b/src/imports/controls/imagine/TabButton.qml index 71cd021f..1cdcfc4b 100644 --- a/src/imports/controls/imagine/TabButton.qml +++ b/src/imports/controls/imagine/TabButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.TabButton { id: control diff --git a/src/imports/controls/imagine/TextArea.qml b/src/imports/controls/imagine/TextArea.qml index 94fe237c..c7505b52 100644 --- a/src/imports/controls/imagine/TextArea.qml +++ b/src/imports/controls/imagine/TextArea.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.TextArea { id: control diff --git a/src/imports/controls/imagine/TextField.qml b/src/imports/controls/imagine/TextField.qml index 2943396e..3ff0ad44 100644 --- a/src/imports/controls/imagine/TextField.qml +++ b/src/imports/controls/imagine/TextField.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.TextField { id: control diff --git a/src/imports/controls/imagine/ToolBar.qml b/src/imports/controls/imagine/ToolBar.qml index f1cb3768..99bcd3ba 100644 --- a/src/imports/controls/imagine/ToolBar.qml +++ b/src/imports/controls/imagine/ToolBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ToolBar { id: control diff --git a/src/imports/controls/imagine/ToolButton.qml b/src/imports/controls/imagine/ToolButton.qml index e41c2cf8..cc22f88d 100644 --- a/src/imports/controls/imagine/ToolButton.qml +++ b/src/imports/controls/imagine/ToolButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ToolButton { id: control diff --git a/src/imports/controls/imagine/ToolSeparator.qml b/src/imports/controls/imagine/ToolSeparator.qml index 8961b259..c0887e4d 100644 --- a/src/imports/controls/imagine/ToolSeparator.qml +++ b/src/imports/controls/imagine/ToolSeparator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ToolSeparator { id: control diff --git a/src/imports/controls/imagine/ToolTip.qml b/src/imports/controls/imagine/ToolTip.qml index 2bcb4fa8..250452d8 100644 --- a/src/imports/controls/imagine/ToolTip.qml +++ b/src/imports/controls/imagine/ToolTip.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.ToolTip { id: control diff --git a/src/imports/controls/imagine/Tumbler.qml b/src/imports/controls/imagine/Tumbler.qml index 80e8eb1f..d49966b0 100644 --- a/src/imports/controls/imagine/Tumbler.qml +++ b/src/imports/controls/imagine/Tumbler.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Imagine 2.5 -import QtQuick.Controls.Imagine.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 T.Tumbler { id: control diff --git a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp index 490825ff..71c013d5 100644 --- a/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp +++ b/src/imports/controls/imagine/qtquickcontrols2imaginestyleplugin.cpp @@ -67,11 +67,11 @@ QtQuickControls2ImagineStylePlugin::QtQuickControls2ImagineStylePlugin(QObject * void QtQuickControls2ImagineStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.10 -> 2.3, 5.11 -> 2.4, ... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterUncreatableType<QQuickImagineStyle>(uri, 2, 3, "Imagine", tr("Imagine is an attached property")); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.10 -> 2.3, 5.11 -> 2.4, ... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterType<QQuickAnimatedImageSelector>(import, 2, 3, "AnimatedImageSelector"); qmlRegisterType<QQuickImageSelector>(import, 2, 3, "ImageSelector"); diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 94aaeff3..6a10ed7f 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/material/BoxShadow.qml b/src/imports/controls/material/BoxShadow.qml index 5004c7f6..5a746c0f 100644 --- a/src/imports/controls/material/BoxShadow.qml +++ b/src/imports/controls/material/BoxShadow.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 /* A implementation of CSS's box-shadow, used by ElevationEffect for a Material Design diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index 18887669..8173248c 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 62afe2cb..6f7d6c70 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Button { id: control diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 3ba8c887..cad5ae97 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index caf0f8e1..34495e2d 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index 67f46551..673d6f48 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Rectangle { id: indicatorItem diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 5db53d1c..223f8fca 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -35,12 +35,12 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ComboBox { id: control diff --git a/src/imports/controls/material/CursorDelegate.qml b/src/imports/controls/material/CursorDelegate.qml index ffb3b3dd..f472e8ae 100644 --- a/src/imports/controls/material/CursorDelegate.qml +++ b/src/imports/controls/material/CursorDelegate.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 +import QtQuick.Controls.Material 2.12 Rectangle { id: cursor diff --git a/src/imports/controls/material/DelayButton.qml b/src/imports/controls/material/DelayButton.qml index fddd49e4..6b5ef3ad 100644 --- a/src/imports/controls/material/DelayButton.qml +++ b/src/imports/controls/material/DelayButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.DelayButton { id: control diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index ce6bbc4b..1148dd25 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Dial { id: control diff --git a/src/imports/controls/material/Dialog.qml b/src/imports/controls/material/Dialog.qml index 9426096e..364c0e57 100644 --- a/src/imports/controls/material/Dialog.qml +++ b/src/imports/controls/material/Dialog.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Dialog { id: control diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index eee9b88d..c53b8210 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/DialogButtonBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml index 6721e10f..3d64cdef 100644 --- a/src/imports/controls/material/Drawer.qml +++ b/src/imports/controls/material/Drawer.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Drawer { id: control diff --git a/src/imports/controls/material/ElevationEffect.qml b/src/imports/controls/material/ElevationEffect.qml index 7e5d79aa..06b654a8 100644 --- a/src/imports/controls/material/ElevationEffect.qml +++ b/src/imports/controls/material/ElevationEffect.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 /* An effect for standard Material Design elevation shadows. Useful for using as \c layer.effect. diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index 7af59ca1..0001825e 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Frame { id: control diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index b07bb12d..e18a5949 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index b4839dd3..2078ce6c 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml index 49333e86..ad923a24 100644 --- a/src/imports/controls/material/Label.qml +++ b/src/imports/controls/material/Label.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.Label { id: control diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 8f7c797c..d28713a7 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/material/MenuBar.qml b/src/imports/controls/material/MenuBar.qml index 74c5083d..66252d6e 100644 --- a/src/imports/controls/material/MenuBar.qml +++ b/src/imports/controls/material/MenuBar.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/material/MenuBarItem.qml b/src/imports/controls/material/MenuBarItem.qml index eeb93fe4..588d6fbb 100644 --- a/src/imports/controls/material/MenuBarItem.qml +++ b/src/imports/controls/material/MenuBarItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 1f9caf8d..069ad216 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/material/MenuSeparator.qml b/src/imports/controls/material/MenuSeparator.qml index 6eb597c3..6d80c049 100644 --- a/src/imports/controls/material/MenuSeparator.qml +++ b/src/imports/controls/material/MenuSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index 6e09f44f..4da0ecc6 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.Page { id: control diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 5cfcce04..5e6ca245 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index af2c2642..988e225a 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Pane { id: control diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index 3d7039bb..1b576385 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Popup { id: control diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index 269ac657..2848f037 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index 108ddbad..47bbbd80 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 5cc23829..edc93c2c 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml index f69f31cc..4be816ad 100644 --- a/src/imports/controls/material/RadioIndicator.qml +++ b/src/imports/controls/material/RadioIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index 8c8a88b1..d735573a 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml index fafc92c7..13d0f9db 100644 --- a/src/imports/controls/material/RoundButton.qml +++ b/src/imports/controls/material/RoundButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.RoundButton { id: control diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 01a33f9e..a376742d 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ScrollBar { id: control diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index 5578f29e..19f23ad2 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ScrollIndicator { id: control diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index 33b333fe..cc6a1413 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.Slider { id: control diff --git a/src/imports/controls/material/SliderHandle.qml b/src/imports/controls/material/SliderHandle.qml index 2ebbcccd..b3bdb802 100644 --- a/src/imports/controls/material/SliderHandle.qml +++ b/src/imports/controls/material/SliderHandle.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Item { id: root diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index d0a09a10..23c86bc3 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.SpinBox { id: control diff --git a/src/imports/controls/material/StackView.qml b/src/imports/controls/material/StackView.qml index 6f76e2e3..dd5d6ce6 100644 --- a/src/imports/controls/material/StackView.qml +++ b/src/imports/controls/material/StackView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.StackView { id: control diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index fe036486..d06799be 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.SwipeDelegate { id: control diff --git a/src/imports/controls/material/SwipeView.qml b/src/imports/controls/material/SwipeView.qml index 62d8b1a9..12ea36ae 100644 --- a/src/imports/controls/material/SwipeView.qml +++ b/src/imports/controls/material/SwipeView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.SwipeView { id: control diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index 677a57e8..fd0db925 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 +import QtQuick.Templates 2.12 as T T.Switch { id: control diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index 1f1e5ffa..bae5171b 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/material/SwitchIndicator.qml b/src/imports/controls/material/SwitchIndicator.qml index f7567059..7fef407c 100644 --- a/src/imports/controls/material/SwitchIndicator.qml +++ b/src/imports/controls/material/SwitchIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 Item { id: indicator diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml index 1e9444fb..98c9132a 100644 --- a/src/imports/controls/material/TabBar.qml +++ b/src/imports/controls/material/TabBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TabBar { id: control diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index c5cd8f9b..5245652c 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TabButton { id: control diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index ce49af53..249b6401 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TextArea { id: control diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 7aa612eb..ed42b295 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.TextField { id: control diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index 9c09778b..5b887598 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ToolBar { id: control diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 55f1bd52..69c42441 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.ToolButton { id: control diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/imports/controls/material/ToolSeparator.qml index 8120ac54..94367657 100644 --- a/src/imports/controls/material/ToolSeparator.qml +++ b/src/imports/controls/material/ToolSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ToolSeparator { id: control diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index ced62f47..fb705367 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.ToolTip { id: control diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index c35b771a..92e24430 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 T.Tumbler { id: control diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index d407af94..eb0e6c87 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -68,11 +68,11 @@ QtQuickControls2MaterialStylePlugin::QtQuickControls2MaterialStylePlugin(QObject void QtQuickControls2MaterialStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 2, 0, "Material", tr("Material is an attached property")); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterType<QQuickMaterialBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); qmlRegisterType<QQuickMaterialProgressBar>(import, 2, 0, "ProgressBarImpl"); diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 0dd787b4..133be0d1 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -120,7 +120,13 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) stylePlugin->initializeTheme(theme); qDeleteAll(stylePlugins); - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // Register the latest version, even if there are no new types or new revisions for existing types yet. + // Before Qt 5.12, we would do the following: + // + // qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // + // However, we want to align with the rest of Qt Quick which uses Qt's minor version. + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // QtQuick.Controls 2.0 (originally introduced in Qt 5.7) qmlRegisterType(resolvedUrl(QStringLiteral("AbstractButton.qml")), uri, 2, 0, "AbstractButton"); @@ -192,8 +198,14 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) qmlRegisterUncreatableType<QQuickSplitHandleAttached>(uri, 2, 5, "SplitHandle", QStringLiteral("SplitHandle is only available as an attached property.")); + // Register the latest version, even if there are no new types or new revisions for existing types yet. + // Before Qt 5.12, we would do the following: + // + // qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // + // However, we want to align with the rest of Qt Quick which uses Qt's minor version. const QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // QtQuick.Controls.impl 2.0 (Qt 5.7) qmlRegisterType<QQuickDefaultBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); @@ -272,6 +284,10 @@ QList<QQuickStylePlugin *> QtQuickControls2Plugin::loadStylePlugins() // release versions of the same Qt libraries (due to the plugin's dependencies). filePath += QStringLiteral("_debug"); #endif // Q_OS_MACOS && QT_DEBUG +#if defined(Q_OS_WIN) && defined(QT_DEBUG) + // Debug versions of plugins have a "d" prefix on Windows. + filePath += QLatin1Char('d'); +#endif // Q_OS_WIN && QT_DEBUG loader.setFileName(filePath); QQuickStylePlugin *stylePlugin = qobject_cast<QQuickStylePlugin *>(loader.instance()); if (stylePlugin) diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index 313b980e..153b9e8e 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Window 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.ApplicationWindow { id: window diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index cc6f241d..2ad21b46 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.BusyIndicator { id: control diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index 648b2950..657b2835 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.Button { id: control diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index b0632da1..b726339a 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.CheckBox { id: control diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index 98092919..7847f459 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.CheckDelegate { id: control diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/CheckIndicator.qml index cf8ce3c6..0f535ea6 100644 --- a/src/imports/controls/universal/CheckIndicator.qml +++ b/src/imports/controls/universal/CheckIndicator.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 37b008ba..3ec7e98b 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Window 2.3 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Window 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ComboBox { id: control @@ -58,6 +58,7 @@ T.ComboBox { delegate: ItemDelegate { width: parent.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData + font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal highlighted: control.highlightedIndex === index hoverEnabled: control.hoverEnabled } diff --git a/src/imports/controls/universal/DelayButton.qml b/src/imports/controls/universal/DelayButton.qml index 2df2e0b4..2a3a3b3a 100644 --- a/src/imports/controls/universal/DelayButton.qml +++ b/src/imports/controls/universal/DelayButton.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.DelayButton { id: control diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index ae163cab..276c87d6 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Dial { id: control diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index bf7b274c..6151d090 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 T.Dialog { id: control diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 84393a79..ac2dc541 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 T.DialogButtonBox { id: control diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index 6c824c8f..7ec1d7f8 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Drawer { id: control diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index e82c0773..8bb44849 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Frame { id: control diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index 792fcb93..dc156dd7 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.GroupBox { id: control diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index 656aa338..ed985405 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.ItemDelegate { id: control diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml index 2e6bb1c3..c66435c3 100644 --- a/src/imports/controls/universal/Label.qml +++ b/src/imports/controls/universal/Label.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Label { id: control diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 567b13af..619cfa40 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 import QtQuick.Window 2.12 T.Menu { diff --git a/src/imports/controls/universal/MenuBar.qml b/src/imports/controls/universal/MenuBar.qml index f2a26a46..2317f505 100644 --- a/src/imports/controls/universal/MenuBar.qml +++ b/src/imports/controls/universal/MenuBar.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.MenuBar { id: control diff --git a/src/imports/controls/universal/MenuBarItem.qml b/src/imports/controls/universal/MenuBarItem.qml index 34d9ad29..30f1fc57 100644 --- a/src/imports/controls/universal/MenuBarItem.qml +++ b/src/imports/controls/universal/MenuBarItem.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.MenuBarItem { id: control diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 7b52300c..23d0ee3c 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.MenuItem { id: control diff --git a/src/imports/controls/universal/MenuSeparator.qml b/src/imports/controls/universal/MenuSeparator.qml index 9e3b1d89..72f9f6f7 100644 --- a/src/imports/controls/universal/MenuSeparator.qml +++ b/src/imports/controls/universal/MenuSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.MenuSeparator { id: control diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index e09225e4..347d6d9a 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Page { id: control diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index a89a7d07..3dcc84ab 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.PageIndicator { id: control diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml index d643bb7f..63a5ecec 100644 --- a/src/imports/controls/universal/Pane.qml +++ b/src/imports/controls/universal/Pane.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Pane { id: control diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index 739fab68..e39134e1 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Popup { id: control diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index 7403f74c..ce79bd54 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.ProgressBar { id: control diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index 7c8fdcc9..5a61c3f7 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.RadioButton { id: control diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 2e068c4b..d56cef33 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.RadioDelegate { id: control diff --git a/src/imports/controls/universal/RadioIndicator.qml b/src/imports/controls/universal/RadioIndicator.qml index 71cb7098..68d53d45 100644 --- a/src/imports/controls/universal/RadioIndicator.qml +++ b/src/imports/controls/universal/RadioIndicator.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Controls.Universal 2.12 Rectangle { implicitWidth: 20 diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index 57b30ea9..f2e4d71e 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.RangeSlider { id: control diff --git a/src/imports/controls/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 06455e0c..2eedf96e 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.RoundButton { id: control diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 6cb77245..d6a525f7 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ScrollBar { id: control diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index b2dd6bbd..ab66ee7c 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ScrollIndicator { id: control diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index 5ccf83b6..8f427b1e 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.Slider { id: control diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index 0ef08538..dfe927f5 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.SpinBox { id: control diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml index c4cf70e7..5a3f7751 100644 --- a/src/imports/controls/universal/StackView.qml +++ b/src/imports/controls/universal/StackView.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.StackView { id: control diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 492e2e3a..066049a7 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.SwipeDelegate { id: control diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 538562bc..962d5157 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.Switch { id: control diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 32e63cf5..bf6069f5 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -35,11 +35,11 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls.Universal.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls.Universal.impl 2.12 T.SwitchDelegate { id: control diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/SwitchIndicator.qml index 12a71f16..ad9a23e9 100644 --- a/src/imports/controls/universal/SwitchIndicator.qml +++ b/src/imports/controls/universal/SwitchIndicator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 Item { implicitWidth: 44 diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml index d2bdcfa1..ab660c93 100644 --- a/src/imports/controls/universal/TabBar.qml +++ b/src/imports/controls/universal/TabBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.TabBar { id: control diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index b512026a..66e3d725 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.TabButton { id: control diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 2d5934df..03ad4a89 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.TextArea { id: control diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 04e40fa5..ba5bf685 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.TextField { id: control diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml index 539dcd2e..5a385e8e 100644 --- a/src/imports/controls/universal/ToolBar.qml +++ b/src/imports/controls/universal/ToolBar.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ToolBar { id: control diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 62746461..f36dac22 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Universal 2.12 T.ToolButton { id: control diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/imports/controls/universal/ToolSeparator.qml index 630fa867..ee8e6e1c 100644 --- a/src/imports/controls/universal/ToolSeparator.qml +++ b/src/imports/controls/universal/ToolSeparator.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ToolSeparator { id: control diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 528d49b5..cf7325b6 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -35,8 +35,8 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 T.ToolTip { id: control diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index cccd4224..f7338c2b 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -35,10 +35,10 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Universal 2.5 -import QtQuick.Controls 2.5 -import QtQuick.Controls.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Universal 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 T.Tumbler { id: control diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp index 1265f636..7a999b79 100644 --- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp @@ -65,11 +65,11 @@ QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObje void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri) { - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 2, 0, "Universal", tr("Universal is an attached property")); QByteArray import = QByteArray(uri) + ".impl"; - qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + qmlRegisterModule(import, 2, QT_VERSION_MINOR); // Qt 5.12->2.12, 5.13->2.13... qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle"); qmlRegisterType<QQuickUniversalBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); diff --git a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc index 01e70bb2..33ee08d3 100644 --- a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc +++ b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc @@ -38,7 +38,7 @@ \c .qml file: \badcode - import QtQuick.Templates 2.5 as T + import QtQuick.Templates 2.12 as T \endcode For the sake of clarity, there is a one-to-one mapping between the types diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 0d5765be..510980e3 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -162,7 +162,13 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) registered = true; initProviders(); - qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // Register the latest version, even if there are no new types or new revisions for existing types yet. + // Before Qt 5.12, we would do the following: + // + // qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2... + // + // However, we want to align with the rest of Qt Quick which uses Qt's minor version. + qmlRegisterModule(uri, 2, QT_VERSION_MINOR); // QtQuick.Templates 2.0 (originally introduced in Qt 5.7) qmlRegisterType<QQuickAbstractButton>(uri, 2, 0, "AbstractButton"); diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index f5d80fb9..acd98470 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE \image qtquickcontrols2-applicationwindow-wireframe.png \qml - import QtQuick.Controls 2.3 + import QtQuick.Controls 2.12 ApplicationWindow { visible: true diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp index 77abee07..ffdb7cc2 100644 --- a/src/quicktemplates2/qquickcombobox.cpp +++ b/src/quicktemplates2/qquickcombobox.cpp @@ -41,7 +41,7 @@ #include "qquickpopup_p_p.h" #include "qquickdeferredexecute_p_p.h" -#include <QtCore/qregexp.h> +#include <QtCore/qregularexpression.h> #include <QtCore/qabstractitemmodel.h> #include <QtGui/qinputmethod.h> #include <QtGui/qguiapplication.h> @@ -573,6 +573,8 @@ int QQuickComboBoxPrivate::match(int start, const QString &text, Qt::MatchFlags uint matchType = flags & 0x0F; bool wrap = flags & Qt::MatchWrap; Qt::CaseSensitivity cs = flags & Qt::MatchCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; + QRegularExpression::PatternOptions options = flags & Qt::MatchCaseSensitive ? QRegularExpression::NoPatternOption + : QRegularExpression::CaseInsensitiveOption; int from = start; int to = q->count(); @@ -585,14 +587,19 @@ int QQuickComboBoxPrivate::match(int start, const QString &text, Qt::MatchFlags if (t == text) return idx; break; - case Qt::MatchRegExp: - if (QRegExp(text, cs).exactMatch(t)) + case Qt::MatchRegExp: { + QRegularExpression rx(QRegularExpression::anchoredPattern(text), options); + if (rx.match(t).hasMatch()) return idx; break; - case Qt::MatchWildcard: - if (QRegExp(text, cs, QRegExp::Wildcard).exactMatch(t)) + } + case Qt::MatchWildcard: { + QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(text), + options); + if (rx.match(t).hasMatch()) return idx; break; + } case Qt::MatchStartsWith: if (t.startsWith(text, cs)) return idx; diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp index 8217a3ff..c4af6151 100644 --- a/src/quicktemplates2/qquickcontainer.cpp +++ b/src/quicktemplates2/qquickcontainer.cpp @@ -336,21 +336,6 @@ void QQuickContainerPrivate::reorderItems() } } -// Helper function needed for derived classes such as QQuickMenuBarPrivate. -void QQuickContainerPrivate::addObject(QObject *obj) -{ - Q_Q(QQuickContainer); - QQuickItem *item = qobject_cast<QQuickItem *>(obj); - if (item) { - if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) - item->setParentItem(effectiveContentItem(contentItem)); - else if (contentModel->indexOf(item, nullptr) == -1) - q->addItem(item); - } else { - contentData.append(obj); - } -} - void QQuickContainerPrivate::_q_currentIndexChanged() { Q_Q(QQuickContainer); @@ -394,7 +379,15 @@ void QQuickContainerPrivate::contentData_append(QQmlListProperty<QObject> *prop, { QQuickContainer *q = static_cast<QQuickContainer *>(prop->object); QQuickContainerPrivate *p = QQuickContainerPrivate::get(q); - p->addObject(obj); + QQuickItem *item = qobject_cast<QQuickItem *>(obj); + if (item) { + if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) + item->setParentItem(effectiveContentItem(p->contentItem)); + else if (p->contentModel->indexOf(item, nullptr) == -1) + q->addItem(item); + } else { + p->contentData.append(obj); + } } int QQuickContainerPrivate::contentData_count(QQmlListProperty<QObject> *prop) diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h index 5ddf298a..16e9c9f6 100644 --- a/src/quicktemplates2/qquickcontainer_p_p.h +++ b/src/quicktemplates2/qquickcontainer_p_p.h @@ -73,8 +73,6 @@ public: void removeItem(int index, QQuickItem *item); void reorderItems(); - void addObject(QObject *obj); - void _q_currentIndexChanged(); void itemChildAdded(QQuickItem *item, QQuickItem *child) override; diff --git a/src/quicktemplates2/qquickdeferredexecute.cpp b/src/quicktemplates2/qquickdeferredexecute.cpp index b298a81d..800dcedb 100644 --- a/src/quicktemplates2/qquickdeferredexecute.cpp +++ b/src/quicktemplates2/qquickdeferredexecute.cpp @@ -76,8 +76,9 @@ static bool beginDeferred(QQmlEnginePrivate *enginePriv, const QQmlProperty &pro for (auto dit = ddata->deferredData.rbegin(); dit != ddata->deferredData.rend(); ++dit) { QQmlData::DeferredData *deferData = *dit; - auto range = deferData->bindings.equal_range(propertyIndex); - if (range.first == deferData->bindings.end()) + auto bindings = deferData->bindings; + auto range = bindings.equal_range(propertyIndex); + if (range.first == bindings.end()) continue; QQmlComponentPrivate::ConstructionState *state = new QQmlComponentPrivate::ConstructionState; diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 03f5f8e8..8559ad15 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -241,8 +241,11 @@ void QQuickDialogButtonBoxPrivate::resizeContent() return; QRectF geometry = q->boundingRect().adjusted(q->leftPadding(), q->topPadding(), -q->rightPadding(), -q->bottomPadding()); - if (alignment != 0) - geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(contentWidth, contentHeight), geometry); + if (alignment != 0) { + qreal cw = (alignment & Qt::AlignHorizontal_Mask) == 0 ? q->availableWidth() : contentItem->property("contentWidth").toReal(); + qreal ch = (alignment & Qt::AlignVertical_Mask) == 0 ? q->availableHeight() : contentItem->property("contentHeight").toReal(); + geometry = alignedRect(q->isMirrored() ? Qt::RightToLeft : Qt::LeftToRight, alignment, QSizeF(cw, ch), geometry); + } contentItem->setPosition(geometry.topLeft()); contentItem->setSize(geometry.size()); diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp index f2d74b31..95b27512 100644 --- a/src/quicktemplates2/qquickdrawer.cpp +++ b/src/quicktemplates2/qquickdrawer.cpp @@ -68,9 +68,9 @@ QT_BEGIN_NAMESPACE drawer is then opened by \e "dragging" it out from the left edge of the window. - \code - import QtQuick 2.7 - import QtQuick.Controls 2.0 + \code \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { id: window @@ -98,9 +98,9 @@ QT_BEGIN_NAMESPACE Drawer can be configured to cover only part of its window edge. The following example illustrates how Drawer can be positioned to appear below a window header: - \code - import QtQuick 2.7 - import QtQuick.Controls 2.0 + \code \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { id: window @@ -124,9 +124,9 @@ QT_BEGIN_NAMESPACE In the image above, the application's contents are \e "pushed" across the screen. This is achieved by applying a translation to the contents: - \code - import QtQuick 2.7 - import QtQuick.Controls 2.1 + \code \QtMinorVersion + import QtQuick 2.\1 + import QtQuick.Controls 2.\1 ApplicationWindow { id: window diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 7086db91..f52405c9 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -251,41 +251,6 @@ void QQuickMenuPrivate::removeItem(int index, QQuickItem *item) } } -void QQuickMenuPrivate::createAndAppendItem(QObject *object) -{ - Q_Q(QQuickMenu); - QQuickItem *item = qobject_cast<QQuickItem *>(object); - if (!item) { - if (QQuickAction *action = qobject_cast<QQuickAction *>(object)) - item = createItem(action); - else if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(object)) - item = createItem(menu); - } - - if (item) { - if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) { - QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::SiblingOrder); - item->setParentItem(contentItem); - } else if (contentModel->indexOf(item, nullptr) == -1) { - q->addItem(item); - } - } else { - contentData.append(object); - } -} - -void QQuickMenuPrivate::recreateItems() -{ - // removeItem() will remove stuff from contentData, so we have to make a copy of it. - const auto originalContentData = contentData; - - while (contentModel->count() > 0) - removeItem(0, itemAt(0)); - - for (QObject *object : originalContentData) - createAndAppendItem(object); -} - QQuickItem *QQuickMenuPrivate::beginCreateItem() { Q_Q(QQuickMenu); @@ -661,14 +626,24 @@ void QQuickMenuPrivate::contentData_append(QQmlListProperty<QObject> *prop, QObj QQuickMenu *q = qobject_cast<QQuickMenu *>(prop->object); QQuickMenuPrivate *p = QQuickMenuPrivate::get(q); - if (!p->complete) { - // Don't add items until we're complete, as the delegate could change in the meantime. - // We'll add it to contentData and create it when we're complete. - p->contentData.append(obj); - return; + QQuickItem *item = qobject_cast<QQuickItem *>(obj); + if (!item) { + if (QQuickAction *action = qobject_cast<QQuickAction *>(obj)) + item = p->createItem(action); + else if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(obj)) + item = p->createItem(menu); } - p->createAndAppendItem(obj); + if (item) { + if (QQuickItemPrivate::get(item)->isTransparentForPositioner()) { + QQuickItemPrivate::get(item)->addItemChangeListener(p, QQuickItemPrivate::SiblingOrder); + item->setParentItem(p->contentItem); + } else if (p->contentModel->indexOf(item, nullptr) == -1) { + q->addItem(item); + } + } else { + p->contentData.append(obj); + } } int QQuickMenuPrivate::contentData_count(QQmlListProperty<QObject> *prop) @@ -1381,7 +1356,7 @@ void QQuickMenu::componentComplete() { Q_D(QQuickMenu); QQuickPopup::componentComplete(); - d->recreateItems(); + d->resizeItems(); } void QQuickMenu::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h index c0bb2702..6146b960 100644 --- a/src/quicktemplates2/qquickmenu_p_p.h +++ b/src/quicktemplates2/qquickmenu_p_p.h @@ -78,9 +78,6 @@ public: void moveItem(int from, int to); void removeItem(int index, QQuickItem *item); - void createAndAppendItem(QObject *object); - void recreateItems(); - QQuickItem *beginCreateItem(); void completeCreateItem(); diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp index 62205b6e..6016e70d 100644 --- a/src/quicktemplates2/qquickmenubar.cpp +++ b/src/quicktemplates2/qquickmenubar.cpp @@ -76,25 +76,6 @@ QT_BEGIN_NAMESPACE {Focus Management in Qt Quick Controls 2} */ -void QQuickMenuBarPrivate::createItems() -{ - // removeItem() will remove stuff from contentData, so we have to make a copy of it. - const auto originalContentData = QQuickContainerPrivate::contentData; - // Sanity check that there aren't any items we don't know about. - Q_ASSERT(contentModel->count() == 0); - - for (QObject *object : originalContentData) { - if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(object)) { - // It's a QQuickMenu; create a QQuickMenuBarItem for it. - QQuickItem *menuItem = createItem(menu); - addObject(menuItem); - } else if (qobject_cast<QQuickMenuBarItem *>(object)) { - addObject(object); - } - // If it's neither, skip it because we don't care about it. - } -} - QQuickItem *QQuickMenuBarPrivate::beginCreateItem() { Q_Q(QQuickMenuBar); @@ -273,18 +254,9 @@ void QQuickMenuBarPrivate::itemImplicitHeightChanged(QQuickItem *item) void QQuickMenuBarPrivate::contentData_append(QQmlListProperty<QObject> *prop, QObject *obj) { QQuickMenuBar *menuBar = static_cast<QQuickMenuBar *>(prop->object); - QQuickMenuBarPrivate *menuBarPrivate = QQuickMenuBarPrivate::get(menuBar); - if (!menuBarPrivate->componentComplete) { - // Don't add items until we're complete, as the delegate could change in the meantime. - // We'll add it to contentData and create it when we're complete. - menuBarPrivate->QQuickContainerPrivate::contentData.append(obj); - return; - } - - if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(obj)) { - QQuickItem *menuItem = menuBarPrivate->createItem(menu); - menuBarPrivate->addObject(menuItem); - } + if (QQuickMenu *menu = qobject_cast<QQuickMenu *>(obj)) + obj = QQuickMenuBarPrivate::get(menuBar)->createItem(menu); + QQuickContainerPrivate::contentData_append(prop, obj); } void QQuickMenuBarPrivate::menus_append(QQmlListProperty<QQuickMenu> *prop, QQuickMenu *obj) @@ -482,13 +454,6 @@ QQmlListProperty<QObject> QQuickMenuBarPrivate::contentData() QQuickContainerPrivate::contentData_clear); } -void QQuickMenuBar::componentComplete() -{ - Q_D(QQuickMenuBar); - QQuickContainer::componentComplete(); - d->createItems(); -} - bool QQuickMenuBar::eventFilter(QObject *object, QEvent *event) { return QObject::eventFilter(object, event); diff --git a/src/quicktemplates2/qquickmenubar_p.h b/src/quicktemplates2/qquickmenubar_p.h index 983bb578..af37d0f2 100644 --- a/src/quicktemplates2/qquickmenubar_p.h +++ b/src/quicktemplates2/qquickmenubar_p.h @@ -81,7 +81,6 @@ Q_SIGNALS: void menusChanged(); protected: - void componentComplete() override; bool eventFilter(QObject *object, QEvent *event) override; void keyPressEvent(QKeyEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h index 4d5e61e6..75fbed73 100644 --- a/src/quicktemplates2/qquickmenubar_p_p.h +++ b/src/quicktemplates2/qquickmenubar_p_p.h @@ -69,8 +69,6 @@ public: QQmlListProperty<QQuickMenu> menus(); QQmlListProperty<QObject> contentData(); - void createItems(); - QQuickItem *beginCreateItem(); void completeCreateItem(); diff --git a/src/quicktemplates2/qquickmenuseparator.cpp b/src/quicktemplates2/qquickmenuseparator.cpp index 0e2ed9e3..f6b8c4b2 100644 --- a/src/quicktemplates2/qquickmenuseparator.cpp +++ b/src/quicktemplates2/qquickmenuseparator.cpp @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE \image qtquickcontrols2-menuseparator.png \quotefromfile qtquickcontrols2-menuseparator-custom.qml - \skipto import QtQuick 2.6 - \printuntil import QtQuick.Controls 2.1 + \skipto import QtQuick + \printuntil import QtQuick.Controls \skipto Menu \printto contentItem.parent: window \skipline contentItem.parent: window diff --git a/src/quicktemplates2/qquickpage.cpp b/src/quicktemplates2/qquickpage.cpp index 93196c4c..56034297 100644 --- a/src/quicktemplates2/qquickpage.cpp +++ b/src/quicktemplates2/qquickpage.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE toolbar header and an application-wide tabbar footer. \qml - import QtQuick.Controls 2.1 + import QtQuick.Controls 2.12 ApplicationWindow { visible: true @@ -344,7 +344,7 @@ void QQuickPage::setFooter(QQuickItem *footer) if (d->footer) { QQuickItemPrivate::get(d->footer)->removeItemChangeListener(d, LayoutChanges); - footer->setParentItem(nullptr); + d->footer->setParentItem(nullptr); } d->footer = footer; if (footer) { diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index d5e2c940..dcced8dc 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE \qml import QtQuick.Window 2.2 - import QtQuick.Controls 2.1 + import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp index ebd8ff29..69a57674 100644 --- a/src/quicktemplates2/qquickpopuppositioner.cpp +++ b/src/quicktemplates2/qquickpopuppositioner.cpp @@ -300,7 +300,7 @@ void QQuickPopupPositioner::addAncestorListeners(QQuickItem *item) QQuickItem *p = item; while (p) { - QQuickItemPrivate::get(p)->updateOrAddItemChangeListener(this, AncestorChangeTypes); + QQuickItemPrivate::get(p)->addItemChangeListener(this, AncestorChangeTypes); p = p->parentItem(); } } diff --git a/src/quicktemplates2/qquickslider.cpp b/src/quicktemplates2/qquickslider.cpp index 179dcb64..054ea502 100644 --- a/src/quicktemplates2/qquickslider.cpp +++ b/src/quicktemplates2/qquickslider.cpp @@ -848,7 +848,6 @@ void QQuickSlider::wheelEvent(QWheelEvent *event) const bool wasMoved = !qFuzzyCompare(d->value, oldValue); if (wasMoved) emit moved(); - event->setAccepted(wasMoved); } } #endif diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 15acfeb6..56ffc52f 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -184,13 +184,20 @@ void QQuickTextFieldPrivate::resizeBackground() QQuickItemPrivate *p = QQuickItemPrivate::get(background); if (((!p->widthValid || !extra.isAllocated() || !extra->hasBackgroundWidth) && qFuzzyIsNull(background->x())) || (extra.isAllocated() && (extra->hasLeftInset || extra->hasRightInset))) { + const bool wasWidthValid = p->widthValid; background->setX(getLeftInset()); background->setWidth(width - getLeftInset() - getRightInset()); + // If the user hadn't previously set the width, that shouldn't change when we set it for them. + if (!wasWidthValid) + p->widthValid = false; } if (((!p->heightValid || !extra.isAllocated() || !extra->hasBackgroundHeight) && qFuzzyIsNull(background->y())) || (extra.isAllocated() && (extra->hasTopInset || extra->hasBottomInset))) { + const bool wasHeightValid = p->heightValid; background->setY(getTopInset()); background->setHeight(height - getTopInset() - getBottomInset()); + if (!wasHeightValid) + p->heightValid = false; } resizingBackground = false; @@ -386,8 +393,13 @@ void QQuickTextFieldPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometr return; QQuickItemPrivate *p = QQuickItemPrivate::get(item); - extra.value().hasBackgroundWidth = p->widthValid; - extra.value().hasBackgroundHeight = p->heightValid; + // QTBUG-71875: only allocate the extra data if we have to. + // resizeBackground() relies on the value of extra.isAllocated() + // as part of its checks to see whether it should resize the background or not. + if (p->widthValid || extra.isAllocated()) + extra.value().hasBackgroundWidth = p->widthValid; + if (p->heightValid || extra.isAllocated()) + extra.value().hasBackgroundHeight = p->heightValid; resizeBackground(); } diff --git a/tests/auto/accessibility/data/abstractbutton.qml b/tests/auto/accessibility/data/abstractbutton.qml index 368f4582..b0922176 100644 --- a/tests/auto/accessibility/data/abstractbutton.qml +++ b/tests/auto/accessibility/data/abstractbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 AbstractButton { text: "AbstractButton" diff --git a/tests/auto/accessibility/data/busyindicator.qml b/tests/auto/accessibility/data/busyindicator.qml index 5a1cf54a..e1c33765 100644 --- a/tests/auto/accessibility/data/busyindicator.qml +++ b/tests/auto/accessibility/data/busyindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 BusyIndicator { } diff --git a/tests/auto/accessibility/data/button.qml b/tests/auto/accessibility/data/button.qml index ecaba6cc..600c05da 100644 --- a/tests/auto/accessibility/data/button.qml +++ b/tests/auto/accessibility/data/button.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Button { text: "Button" diff --git a/tests/auto/accessibility/data/checkbox.qml b/tests/auto/accessibility/data/checkbox.qml index cb46c074..f86a9a27 100644 --- a/tests/auto/accessibility/data/checkbox.qml +++ b/tests/auto/accessibility/data/checkbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckBox { text: "CheckBox" diff --git a/tests/auto/accessibility/data/checkdelegate.qml b/tests/auto/accessibility/data/checkdelegate.qml index f911caf0..2750052f 100644 --- a/tests/auto/accessibility/data/checkdelegate.qml +++ b/tests/auto/accessibility/data/checkdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 CheckDelegate { text: "CheckDelegate" diff --git a/tests/auto/accessibility/data/combobox.qml b/tests/auto/accessibility/data/combobox.qml index 52931968..ec4e87ef 100644 --- a/tests/auto/accessibility/data/combobox.qml +++ b/tests/auto/accessibility/data/combobox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ComboBox { model: ["ComboBox"] diff --git a/tests/auto/accessibility/data/container.qml b/tests/auto/accessibility/data/container.qml index 806ebe78..b8d57eea 100644 --- a/tests/auto/accessibility/data/container.qml +++ b/tests/auto/accessibility/data/container.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Container { } diff --git a/tests/auto/accessibility/data/control.qml b/tests/auto/accessibility/data/control.qml index a8fd0613..dac5f935 100644 --- a/tests/auto/accessibility/data/control.qml +++ b/tests/auto/accessibility/data/control.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/accessibility/data/dayofweekrow-2.qml b/tests/auto/accessibility/data/dayofweekrow-2.qml index 265f975a..96c750cb 100644 --- a/tests/auto/accessibility/data/dayofweekrow-2.qml +++ b/tests/auto/accessibility/data/dayofweekrow-2.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 DayOfWeekRow { } diff --git a/tests/auto/accessibility/data/dayofweekrow.qml b/tests/auto/accessibility/data/dayofweekrow.qml index a3ab92dd..a2aa44ec 100644 --- a/tests/auto/accessibility/data/dayofweekrow.qml +++ b/tests/auto/accessibility/data/dayofweekrow.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 DayOfWeekRow { diff --git a/tests/auto/accessibility/data/dial.qml b/tests/auto/accessibility/data/dial.qml index 354ccdbd..9a471548 100644 --- a/tests/auto/accessibility/data/dial.qml +++ b/tests/auto/accessibility/data/dial.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dial { } diff --git a/tests/auto/accessibility/data/dialog.qml b/tests/auto/accessibility/data/dialog.qml index 26e944fd..20317a31 100644 --- a/tests/auto/accessibility/data/dialog.qml +++ b/tests/auto/accessibility/data/dialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Dialog { title: "Dialog" diff --git a/tests/auto/accessibility/data/drawer.qml b/tests/auto/accessibility/data/drawer.qml index 12652164..9b0db5fa 100644 --- a/tests/auto/accessibility/data/drawer.qml +++ b/tests/auto/accessibility/data/drawer.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Drawer { } diff --git a/tests/auto/accessibility/data/frame.qml b/tests/auto/accessibility/data/frame.qml index 6a2ec40e..02e45a78 100644 --- a/tests/auto/accessibility/data/frame.qml +++ b/tests/auto/accessibility/data/frame.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Frame { } diff --git a/tests/auto/accessibility/data/groupbox.qml b/tests/auto/accessibility/data/groupbox.qml index ebb3cf7d..0fa8cff5 100644 --- a/tests/auto/accessibility/data/groupbox.qml +++ b/tests/auto/accessibility/data/groupbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 GroupBox { title: "GroupBox" diff --git a/tests/auto/accessibility/data/itemdelegate.qml b/tests/auto/accessibility/data/itemdelegate.qml index 91e1d910..52831648 100644 --- a/tests/auto/accessibility/data/itemdelegate.qml +++ b/tests/auto/accessibility/data/itemdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ItemDelegate { text: "ItemDelegate" diff --git a/tests/auto/accessibility/data/label.qml b/tests/auto/accessibility/data/label.qml index e799f8de..6d7466bc 100644 --- a/tests/auto/accessibility/data/label.qml +++ b/tests/auto/accessibility/data/label.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Label { text: "Label" diff --git a/tests/auto/accessibility/data/menu.qml b/tests/auto/accessibility/data/menu.qml index b931644a..126914d1 100644 --- a/tests/auto/accessibility/data/menu.qml +++ b/tests/auto/accessibility/data/menu.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Menu { } diff --git a/tests/auto/accessibility/data/menuitem.qml b/tests/auto/accessibility/data/menuitem.qml index 308c1c2b..97fd478f 100644 --- a/tests/auto/accessibility/data/menuitem.qml +++ b/tests/auto/accessibility/data/menuitem.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MenuItem { text: "MenuItem" diff --git a/tests/auto/accessibility/data/monthgrid-2.qml b/tests/auto/accessibility/data/monthgrid-2.qml index 603a208b..6368d090 100644 --- a/tests/auto/accessibility/data/monthgrid-2.qml +++ b/tests/auto/accessibility/data/monthgrid-2.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 MonthGrid { diff --git a/tests/auto/accessibility/data/monthgrid.qml b/tests/auto/accessibility/data/monthgrid.qml index 92a45f0f..03de2499 100644 --- a/tests/auto/accessibility/data/monthgrid.qml +++ b/tests/auto/accessibility/data/monthgrid.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 MonthGrid { diff --git a/tests/auto/accessibility/data/page.qml b/tests/auto/accessibility/data/page.qml index cda7b80b..84036878 100644 --- a/tests/auto/accessibility/data/page.qml +++ b/tests/auto/accessibility/data/page.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Page { title: "Page" diff --git a/tests/auto/accessibility/data/pageindicator.qml b/tests/auto/accessibility/data/pageindicator.qml index a882296e..30184167 100644 --- a/tests/auto/accessibility/data/pageindicator.qml +++ b/tests/auto/accessibility/data/pageindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 PageIndicator { } diff --git a/tests/auto/accessibility/data/pane.qml b/tests/auto/accessibility/data/pane.qml index 24856e26..bde4fad5 100644 --- a/tests/auto/accessibility/data/pane.qml +++ b/tests/auto/accessibility/data/pane.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Pane { } diff --git a/tests/auto/accessibility/data/popup.qml b/tests/auto/accessibility/data/popup.qml index e1d9f8ff..907d0c55 100644 --- a/tests/auto/accessibility/data/popup.qml +++ b/tests/auto/accessibility/data/popup.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { } diff --git a/tests/auto/accessibility/data/progressbar.qml b/tests/auto/accessibility/data/progressbar.qml index c8733d5d..74b2cb84 100644 --- a/tests/auto/accessibility/data/progressbar.qml +++ b/tests/auto/accessibility/data/progressbar.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ProgressBar { from: 0 diff --git a/tests/auto/accessibility/data/radiobutton.qml b/tests/auto/accessibility/data/radiobutton.qml index 1ca431f5..1b046d3e 100644 --- a/tests/auto/accessibility/data/radiobutton.qml +++ b/tests/auto/accessibility/data/radiobutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioButton { text: "RadioButton" diff --git a/tests/auto/accessibility/data/radiodelegate.qml b/tests/auto/accessibility/data/radiodelegate.qml index 93ccafde..f2bec8bc 100644 --- a/tests/auto/accessibility/data/radiodelegate.qml +++ b/tests/auto/accessibility/data/radiodelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RadioDelegate { text: "RadioDelegate" diff --git a/tests/auto/accessibility/data/rangeslider.qml b/tests/auto/accessibility/data/rangeslider.qml index 76736fb8..95bff377 100644 --- a/tests/auto/accessibility/data/rangeslider.qml +++ b/tests/auto/accessibility/data/rangeslider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RangeSlider { from: 0 diff --git a/tests/auto/accessibility/data/roundbutton.qml b/tests/auto/accessibility/data/roundbutton.qml index 8edf58de..20f0ed9a 100644 --- a/tests/auto/accessibility/data/roundbutton.qml +++ b/tests/auto/accessibility/data/roundbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 RoundButton { text: "RoundButton" diff --git a/tests/auto/accessibility/data/scrollbar.qml b/tests/auto/accessibility/data/scrollbar.qml index 1420ed19..1e7cf155 100644 --- a/tests/auto/accessibility/data/scrollbar.qml +++ b/tests/auto/accessibility/data/scrollbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollBar { } diff --git a/tests/auto/accessibility/data/scrollindicator.qml b/tests/auto/accessibility/data/scrollindicator.qml index 34e429ad..24ef9271 100644 --- a/tests/auto/accessibility/data/scrollindicator.qml +++ b/tests/auto/accessibility/data/scrollindicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ScrollIndicator { } diff --git a/tests/auto/accessibility/data/slider.qml b/tests/auto/accessibility/data/slider.qml index 088bd23a..0d1db79c 100644 --- a/tests/auto/accessibility/data/slider.qml +++ b/tests/auto/accessibility/data/slider.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Slider { from: 0 diff --git a/tests/auto/accessibility/data/spinbox.qml b/tests/auto/accessibility/data/spinbox.qml index 07e2a54e..3da1f868 100644 --- a/tests/auto/accessibility/data/spinbox.qml +++ b/tests/auto/accessibility/data/spinbox.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SpinBox { from: 0 diff --git a/tests/auto/accessibility/data/stackview.qml b/tests/auto/accessibility/data/stackview.qml index cf3b76c2..48cb384e 100644 --- a/tests/auto/accessibility/data/stackview.qml +++ b/tests/auto/accessibility/data/stackview.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 StackView { } diff --git a/tests/auto/accessibility/data/swipedelegate.qml b/tests/auto/accessibility/data/swipedelegate.qml index a8acb5e0..d6f503c4 100644 --- a/tests/auto/accessibility/data/swipedelegate.qml +++ b/tests/auto/accessibility/data/swipedelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeDelegate { text: "SwipeDelegate" diff --git a/tests/auto/accessibility/data/swipeview.qml b/tests/auto/accessibility/data/swipeview.qml index 018ab772..efb185e6 100644 --- a/tests/auto/accessibility/data/swipeview.qml +++ b/tests/auto/accessibility/data/swipeview.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwipeView { } diff --git a/tests/auto/accessibility/data/switch.qml b/tests/auto/accessibility/data/switch.qml index 0678f113..b9c8a572 100644 --- a/tests/auto/accessibility/data/switch.qml +++ b/tests/auto/accessibility/data/switch.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Switch { text: "Switch" diff --git a/tests/auto/accessibility/data/switchdelegate.qml b/tests/auto/accessibility/data/switchdelegate.qml index fba0c321..d0d9599c 100644 --- a/tests/auto/accessibility/data/switchdelegate.qml +++ b/tests/auto/accessibility/data/switchdelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 SwitchDelegate { text: "SwitchDelegate" diff --git a/tests/auto/accessibility/data/tabbar.qml b/tests/auto/accessibility/data/tabbar.qml index 209a094f..d65b1305 100644 --- a/tests/auto/accessibility/data/tabbar.qml +++ b/tests/auto/accessibility/data/tabbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TabBar { } diff --git a/tests/auto/accessibility/data/tabbutton.qml b/tests/auto/accessibility/data/tabbutton.qml index c76e9048..72277a9f 100644 --- a/tests/auto/accessibility/data/tabbutton.qml +++ b/tests/auto/accessibility/data/tabbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TabButton { text: "TabButton" diff --git a/tests/auto/accessibility/data/textarea.qml b/tests/auto/accessibility/data/textarea.qml index 1ffe366f..c861cda4 100644 --- a/tests/auto/accessibility/data/textarea.qml +++ b/tests/auto/accessibility/data/textarea.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextArea { text: "TextArea" diff --git a/tests/auto/accessibility/data/textfield.qml b/tests/auto/accessibility/data/textfield.qml index f87957eb..222a1223 100644 --- a/tests/auto/accessibility/data/textfield.qml +++ b/tests/auto/accessibility/data/textfield.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TextField { text: "TextField" diff --git a/tests/auto/accessibility/data/toolbar.qml b/tests/auto/accessibility/data/toolbar.qml index e1887de4..f8cbe311 100644 --- a/tests/auto/accessibility/data/toolbar.qml +++ b/tests/auto/accessibility/data/toolbar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolBar { } diff --git a/tests/auto/accessibility/data/toolbutton.qml b/tests/auto/accessibility/data/toolbutton.qml index e088bb56..84d67cfa 100644 --- a/tests/auto/accessibility/data/toolbutton.qml +++ b/tests/auto/accessibility/data/toolbutton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolButton { text: "ToolButton" diff --git a/tests/auto/accessibility/data/tooltip.qml b/tests/auto/accessibility/data/tooltip.qml index dcb5b3b9..a6f7718d 100644 --- a/tests/auto/accessibility/data/tooltip.qml +++ b/tests/auto/accessibility/data/tooltip.qml @@ -1,5 +1,5 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ToolTip { text: "ToolTip" diff --git a/tests/auto/accessibility/data/tumbler.qml b/tests/auto/accessibility/data/tumbler.qml index 11c737d7..fda5c2bd 100644 --- a/tests/auto/accessibility/data/tumbler.qml +++ b/tests/auto/accessibility/data/tumbler.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Tumbler { } diff --git a/tests/auto/accessibility/data/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/weeknumbercolumn-2.qml index 7d682315..2c5b836b 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn-2.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn-2.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 WeekNumberColumn { } diff --git a/tests/auto/accessibility/data/weeknumbercolumn.qml b/tests/auto/accessibility/data/weeknumbercolumn.qml index 6b024872..71d533ef 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn.qml @@ -1,4 +1,4 @@ -import QtQuick 2.5 +import QtQuick 2.12 import Qt.labs.calendar 1.0 WeekNumberColumn { diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d4e0c604..d528b848 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,6 +5,7 @@ SUBDIRS += \ controls \ cursor \ customization \ + designer \ focus \ font \ palette \ diff --git a/tests/auto/calendar/data/tst_calendarmodel.qml b/tests/auto/calendar/data/tst_calendarmodel.qml index ea9933f1..ccadd488 100644 --- a/tests/auto/calendar/data/tst_calendarmodel.qml +++ b/tests/auto/calendar/data/tst_calendarmodel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import QtQml 2.2 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_dayofweekrow.qml b/tests/auto/calendar/data/tst_dayofweekrow.qml index a62d3d5f..f6615f78 100644 --- a/tests/auto/calendar/data/tst_dayofweekrow.qml +++ b/tests/auto/calendar/data/tst_dayofweekrow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_monthgrid.qml b/tests/auto/calendar/data/tst_monthgrid.qml index e524f53e..25c8378b 100644 --- a/tests/auto/calendar/data/tst_monthgrid.qml +++ b/tests/auto/calendar/data/tst_monthgrid.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_weeknumbercolumn.qml b/tests/auto/calendar/data/tst_weeknumbercolumn.qml index 29f458ca..f94fed43 100644 --- a/tests/auto/calendar/data/tst_weeknumbercolumn.qml +++ b/tests/auto/calendar/data/tst_weeknumbercolumn.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/controls/data/SignalSequenceSpy.qml b/tests/auto/controls/data/SignalSequenceSpy.qml index d14a5ee6..531a7f68 100644 --- a/tests/auto/controls/data/SignalSequenceSpy.qml +++ b/tests/auto/controls/data/SignalSequenceSpy.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.12 QtObject { property QtObject target: null diff --git a/tests/auto/controls/data/TestItem.qml b/tests/auto/controls/data/TestItem.qml index b7c16004..6bd42bac 100644 --- a/tests/auto/controls/data/TestItem.qml +++ b/tests/auto/controls/data/TestItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.5 +import QtQuick 2.12 Item { id: item diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml index 72e57bed..01ff2c03 100644 --- a/tests/auto/controls/data/TumblerDatePicker.qml +++ b/tests/auto/controls/data/TumblerDatePicker.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Row { id: datePicker diff --git a/tests/auto/controls/data/TumblerListView.qml b/tests/auto/controls/data/TumblerListView.qml index 1248bec0..affaa6cd 100644 --- a/tests/auto/controls/data/TumblerListView.qml +++ b/tests/auto/controls/data/TumblerListView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ListView { anchors.fill: parent diff --git a/tests/auto/controls/data/TumblerPathView.qml b/tests/auto/controls/data/TumblerPathView.qml index 7b7cd5f4..8ea86eae 100644 --- a/tests/auto/controls/data/TumblerPathView.qml +++ b/tests/auto/controls/data/TumblerPathView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 PathView { id: pathView diff --git a/tests/auto/controls/data/tst_abstractbutton.qml b/tests/auto/controls/data/tst_abstractbutton.qml index 1ed5e45d..7bfa17c5 100644 --- a/tests/auto/controls/data/tst_abstractbutton.qml +++ b/tests/auto/controls/data/tst_abstractbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_action.qml b/tests/auto/controls/data/tst_action.qml index 35e65202..ef28c0e5 100644 --- a/tests/auto/controls/data/tst_action.qml +++ b/tests/auto/controls/data/tst_action.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 -import QtQuick.Templates 2.3 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_actiongroup.qml b/tests/auto/controls/data/tst_actiongroup.qml index 700d247a..6c8ea5c4 100644 --- a/tests/auto/controls/data/tst_actiongroup.qml +++ b/tests/auto/controls/data/tst_actiongroup.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml index 3de8c795..7801cdab 100644 --- a/tests/auto/controls/data/tst_busyindicator.qml +++ b/tests/auto/controls/data/tst_busyindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index 2cf399f4..bd4fe80e 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_buttongroup.qml b/tests/auto/controls/data/tst_buttongroup.qml index 1b7fa4a3..1abb9795 100644 --- a/tests/auto/controls/data/tst_buttongroup.qml +++ b/tests/auto/controls/data/tst_buttongroup.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index 3fb7d15e..1f00294f 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml index 72b45251..0c0565f1 100644 --- a/tests/auto/controls/data/tst_checkdelegate.qml +++ b/tests/auto/controls/data/tst_checkdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 8e8f9c2f..70c4f090 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_container.qml b/tests/auto/controls/data/tst_container.qml index c5e74eeb..134dbb38 100644 --- a/tests/auto/controls/data/tst_container.qml +++ b/tests/auto/controls/data/tst_container.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 5c66bd04..3c416546 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_delaybutton.qml b/tests/auto/controls/data/tst_delaybutton.qml index 97ae0272..2560177d 100644 --- a/tests/auto/controls/data/tst_delaybutton.qml +++ b/tests/auto/controls/data/tst_delaybutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml index a2d32347..cd2f6112 100644 --- a/tests/auto/controls/data/tst_dial.qml +++ b/tests/auto/controls/data/tst_dial.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_dialog.qml b/tests/auto/controls/data/tst_dialog.qml index e2557a04..1bfffc1d 100644 --- a/tests/auto/controls/data/tst_dialog.qml +++ b/tests/auto/controls/data/tst_dialog.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase @@ -67,6 +67,14 @@ TestCase { } Component { + id: qtbug71444 + Dialog { + header: null + footer: null + } + } + + Component { id: buttonBox DialogButtonBox { } } @@ -198,6 +206,11 @@ TestCase { compare(rejectedSpy.count, 1) } + function test_qtbug71444() { + var control = createTemporaryObject(qtbug71444, testCase) + verify(control) + } + function test_standardButtons() { var control = createTemporaryObject(dialog, testCase) diff --git a/tests/auto/controls/data/tst_dialogbuttonbox.qml b/tests/auto/controls/data/tst_dialogbuttonbox.qml index ed181c5b..62789a47 100644 --- a/tests/auto/controls/data/tst_dialogbuttonbox.qml +++ b/tests/auto/controls/data/tst_dialogbuttonbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase @@ -275,4 +275,21 @@ TestCase { compare(okButton.width + cancelButton.width, control.availableWidth - control.spacing) } + + function test_oneButtonInFixedWidthBox() { + var control = createTemporaryObject(buttonBox, testCase, + { width: 400, standardButtons: Dialog.Close }) + verify(control) + + var listView = control.contentItem + waitForRendering(listView) + + var button = control.itemAt(0) + verify(button) + + // The button should never go outside of the box. + var buttonPosInBox = button.mapToItem(control, 0, 0) + verify(buttonPosInBox.x >= 0) + verify(buttonPosInBox.x + button.width < control.width) + } } diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml index 95838155..a5236b71 100644 --- a/tests/auto/controls/data/tst_frame.qml +++ b/tests/auto/controls/data/tst_frame.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index 446283d8..a4f1b5f3 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml index 4e4ca0c4..1c236361 100644 --- a/tests/auto/controls/data/tst_itemdelegate.qml +++ b/tests/auto/controls/data/tst_itemdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index 8183f088..8384e932 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml index 57286002..27c23ae5 100644 --- a/tests/auto/controls/data/tst_menuitem.qml +++ b/tests/auto/controls/data/tst_menuitem.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml index c709c216..252c6ebf 100644 --- a/tests/auto/controls/data/tst_page.qml +++ b/tests/auto/controls/data/tst_page.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml index dc411e45..0f68b5d8 100644 --- a/tests/auto/controls/data/tst_pageindicator.qml +++ b/tests/auto/controls/data/tst_pageindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/controls/data/tst_pane.qml index 8976d4f9..4006474b 100644 --- a/tests/auto/controls/data/tst_pane.qml +++ b/tests/auto/controls/data/tst_pane.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index 962feae2..27043d1c 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -50,8 +50,8 @@ import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.5 -import QtQuick.Templates 2.5 as T +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index f3648495..74840551 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index 0d18bf01..c16f615c 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml index b1ee00db..ff11fffb 100644 --- a/tests/auto/controls/data/tst_radiodelegate.qml +++ b/tests/auto/controls/data/tst_radiodelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml index 03b34a2a..24f8a207 100644 --- a/tests/auto/controls/data/tst_rangeslider.qml +++ b/tests/auto/controls/data/tst_rangeslider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml index c772c85f..5f4cc5fa 100644 --- a/tests/auto/controls/data/tst_roundbutton.qml +++ b/tests/auto/controls/data/tst_roundbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 90fe9468..0051b785 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml index 9435ec3b..c23bf3e5 100644 --- a/tests/auto/controls/data/tst_scrollindicator.qml +++ b/tests/auto/controls/data/tst_scrollindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index a06072e5..4d5b1e5b 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 368bc9fd..280138c5 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase @@ -772,6 +772,63 @@ TestCase { compare(control.position, 0.25) } + function test_wheelPropagation_data() { + return [ + { tag: "horizontal", orientation: Qt.Horizontal, dx: 120, dy: 0 }, + { tag: "vertical", orientation: Qt.Vertical, dx: 0, dy: 120 } + ] + } + + Component { + id: mouseAreaComponent + MouseArea {} + } + + function test_wheelPropagation(data) { + var mouseArea = createTemporaryObject(mouseAreaComponent, testCase, { width: parent.width, height: parent.height }) + verify(mouseArea) + + var mouseAreaWheelSpy = signalSpy.createObject(mouseArea, { target: mouseArea, signalName: "wheel" }) + verify(mouseAreaWheelSpy.valid) + + var control = createTemporaryObject(slider, mouseArea, + { wheelEnabled: true, orientation: data.orientation, stepSize: 1 }) + verify(control) + compare(control.value, 0.0) + + var movedCount = 0 + var movedSpy = signalSpy.createObject(control, { target: control, signalName: "moved" }) + verify(movedSpy.valid) + + // Scroll the handle to the edge. + mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy) + compare(control.value, 1.0) + compare(control.position, 1.0) + compare(movedSpy.count, ++movedCount) + compare(mouseAreaWheelSpy.count, 0) + + // Scroll again; the wheel event shouldn't go through to the MouseArea parent. + mouseWheel(control, control.width / 2, control.height / 2, data.dx, data.dy) + compare(control.value, 1.0) + compare(control.position, 1.0) + compare(movedSpy.count, movedCount) + compare(mouseAreaWheelSpy.count, 0) + + // Scroll the handle to the other edge. + mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy) + compare(control.value, 0.0) + compare(control.position, 0.0) + compare(movedSpy.count, ++movedCount) + compare(mouseAreaWheelSpy.count, 0) + + // Scroll again; the wheel event shouldn't go through to the MouseArea parent. + mouseWheel(control, control.width / 2, control.height / 2, -data.dx, -data.dy) + compare(control.value, 0.0) + compare(control.position, 0.0) + compare(movedSpy.count, movedCount) + compare(mouseAreaWheelSpy.count, 0) + } + function test_valueAt_data() { return [ { tag: "0.0..1.0", from: 0.0, to: 1.0, values: [0.0, 0.2, 0.5, 1.0] }, diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 47c19f40..419478a2 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 -import QtQuick.Window 2.3 +import QtQuick.Controls 2.12 +import QtQuick.Window 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index 3827354b..a9fbf874 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml index 1668dc84..3e2ff460 100644 --- a/tests/auto/controls/data/tst_swipedelegate.qml +++ b/tests/auto/controls/data/tst_swipedelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml index 1f92bba4..38af37f7 100644 --- a/tests/auto/controls/data/tst_swipeview.qml +++ b/tests/auto/controls/data/tst_swipeview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml index 079bf820..b3fab41c 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml index 187a61bd..1c96023f 100644 --- a/tests/auto/controls/data/tst_switchdelegate.qml +++ b/tests/auto/controls/data/tst_switchdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml index 58917d84..519b1d53 100644 --- a/tests/auto/controls/data/tst_tabbar.qml +++ b/tests/auto/controls/data/tst_tabbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml index 3cb22ecd..96384769 100644 --- a/tests/auto/controls/data/tst_tabbutton.qml +++ b/tests/auto/controls/data/tst_tabbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 0a50e033..ee40c9b7 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 963046e4..2ee1db41 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -48,9 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 TestCase { id: testCase @@ -633,4 +634,30 @@ TestCase { compare(control.background.height, 100) } + Component { + id: layoutComponent + + ColumnLayout { + anchors.fill: parent + + property alias textField: textField + + TextField { + id: textField + placeholderText: "Placeholder" + Layout.fillWidth: true + } + } + } + + function test_inLayout() { + var layout = createTemporaryObject(layoutComponent, testCase) + verify(layout) + + var control = layout.textField + verify(control) + + compare(control.width, control.parent.width) + compare(control.background.width, control.width) + } } diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index c0f0845c..09c3a830 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index 9e79cb8c..622554c7 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolseparator.qml b/tests/auto/controls/data/tst_toolseparator.qml index d210dc6d..d3581b96 100644 --- a/tests/auto/controls/data/tst_toolseparator.qml +++ b/tests/auto/controls/data/tst_toolseparator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml index 99b6ee14..8a855ce0 100644 --- a/tests/auto/controls/data/tst_tooltip.qml +++ b/tests/auto/controls/data/tst_tooltip.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index 18f63ed4..7c2095f8 100644 --- a/tests/auto/controls/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase diff --git a/tests/auto/controls/default/dependencies.qml b/tests/auto/controls/default/dependencies.qml index 61cd0f17..7ffafb84 100644 --- a/tests/auto/controls/default/dependencies.qml +++ b/tests/auto/controls/default/dependencies.qml @@ -1,5 +1,5 @@ import QtTest 1.0 -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 TestCase { } diff --git a/tests/auto/controls/fusion/dependencies.qml b/tests/auto/controls/fusion/dependencies.qml index 30c32fa5..2da1b2bb 100644 --- a/tests/auto/controls/fusion/dependencies.qml +++ b/tests/auto/controls/fusion/dependencies.qml @@ -1,6 +1,6 @@ import QtTest 1.0 -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Fusion 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Fusion 2.12 TestCase { } diff --git a/tests/auto/controls/imagine/dependencies.qml b/tests/auto/controls/imagine/dependencies.qml index 3811fec0..e681aa4f 100644 --- a/tests/auto/controls/imagine/dependencies.qml +++ b/tests/auto/controls/imagine/dependencies.qml @@ -1,6 +1,6 @@ import QtTest 1.0 -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 TestCase { } diff --git a/tests/auto/controls/material/dependencies.qml b/tests/auto/controls/material/dependencies.qml index 5eda844b..f926944e 100644 --- a/tests/auto/controls/material/dependencies.qml +++ b/tests/auto/controls/material/dependencies.qml @@ -1,6 +1,6 @@ import QtTest 1.0 -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import QtQuick.Controls.Material 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 TestCase { } diff --git a/tests/auto/controls/universal/dependencies.qml b/tests/auto/controls/universal/dependencies.qml index 67c54871..a4a0d0a0 100644 --- a/tests/auto/controls/universal/dependencies.qml +++ b/tests/auto/controls/universal/dependencies.qml @@ -1,6 +1,6 @@ import QtTest 1.0 -import QtQuick 2.6 -import QtQuick.Controls 2.2 -import QtQuick.Controls.Universal 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 TestCase { } diff --git a/tests/auto/cursor/data/buttons.qml b/tests/auto/cursor/data/buttons.qml index 21226ef5..2107a8f3 100644 --- a/tests/auto/cursor/data/buttons.qml +++ b/tests/auto/cursor/data/buttons.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/containers.qml b/tests/auto/cursor/data/containers.qml index 09fbbc18..c9dc09d9 100644 --- a/tests/auto/cursor/data/containers.qml +++ b/tests/auto/cursor/data/containers.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/editable.qml b/tests/auto/cursor/data/editable.qml index 1956889b..305d7d46 100644 --- a/tests/auto/cursor/data/editable.qml +++ b/tests/auto/cursor/data/editable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/pageindicator.qml b/tests/auto/cursor/data/pageindicator.qml index 1e550a78..228f010d 100644 --- a/tests/auto/cursor/data/pageindicator.qml +++ b/tests/auto/cursor/data/pageindicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: 200 diff --git a/tests/auto/cursor/data/scrollbar.qml b/tests/auto/cursor/data/scrollbar.qml index 01dcd2ae..41fda945 100644 --- a/tests/auto/cursor/data/scrollbar.qml +++ b/tests/auto/cursor/data/scrollbar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/cursor/data/sliders.qml b/tests/auto/cursor/data/sliders.qml index 408e8947..e3ac2cb1 100644 --- a/tests/auto/cursor/data/sliders.qml +++ b/tests/auto/cursor/data/sliders.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/customization/data/styles/empty/AbstractButton.qml b/tests/auto/customization/data/styles/empty/AbstractButton.qml index 5cff3ce8..56aaaa04 100644 --- a/tests/auto/customization/data/styles/empty/AbstractButton.qml +++ b/tests/auto/customization/data/styles/empty/AbstractButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.AbstractButton { id: control diff --git a/tests/auto/customization/data/styles/empty/ApplicationWindow.qml b/tests/auto/customization/data/styles/empty/ApplicationWindow.qml index e814d2d6..820b67ae 100644 --- a/tests/auto/customization/data/styles/empty/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/empty/ApplicationWindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ApplicationWindow { id: control diff --git a/tests/auto/customization/data/styles/empty/BusyIndicator.qml b/tests/auto/customization/data/styles/empty/BusyIndicator.qml index b56e9fa3..2d212ed2 100644 --- a/tests/auto/customization/data/styles/empty/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/empty/BusyIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.BusyIndicator { id: control diff --git a/tests/auto/customization/data/styles/empty/Button.qml b/tests/auto/customization/data/styles/empty/Button.qml index 865c97f7..54daa586 100644 --- a/tests/auto/customization/data/styles/empty/Button.qml +++ b/tests/auto/customization/data/styles/empty/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Button { id: control diff --git a/tests/auto/customization/data/styles/empty/CheckBox.qml b/tests/auto/customization/data/styles/empty/CheckBox.qml index f01402bd..64799ca5 100644 --- a/tests/auto/customization/data/styles/empty/CheckBox.qml +++ b/tests/auto/customization/data/styles/empty/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckBox { id: control diff --git a/tests/auto/customization/data/styles/empty/CheckDelegate.qml b/tests/auto/customization/data/styles/empty/CheckDelegate.qml index a807eb23..b7ea827d 100644 --- a/tests/auto/customization/data/styles/empty/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/empty/CheckDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckDelegate { id: control diff --git a/tests/auto/customization/data/styles/empty/ComboBox.qml b/tests/auto/customization/data/styles/empty/ComboBox.qml index 5e7e9b14..2c5cb266 100644 --- a/tests/auto/customization/data/styles/empty/ComboBox.qml +++ b/tests/auto/customization/data/styles/empty/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/empty/Container.qml b/tests/auto/customization/data/styles/empty/Container.qml index 2e596d6a..1d376cce 100644 --- a/tests/auto/customization/data/styles/empty/Container.qml +++ b/tests/auto/customization/data/styles/empty/Container.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Container { id: control diff --git a/tests/auto/customization/data/styles/empty/Control.qml b/tests/auto/customization/data/styles/empty/Control.qml index 76e67af1..c7db674a 100644 --- a/tests/auto/customization/data/styles/empty/Control.qml +++ b/tests/auto/customization/data/styles/empty/Control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Control { id: control diff --git a/tests/auto/customization/data/styles/empty/DelayButton.qml b/tests/auto/customization/data/styles/empty/DelayButton.qml index 142d7980..e1cd7dde 100644 --- a/tests/auto/customization/data/styles/empty/DelayButton.qml +++ b/tests/auto/customization/data/styles/empty/DelayButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DelayButton { id: control diff --git a/tests/auto/customization/data/styles/empty/Dial.qml b/tests/auto/customization/data/styles/empty/Dial.qml index 68a4e035..94af0a3e 100644 --- a/tests/auto/customization/data/styles/empty/Dial.qml +++ b/tests/auto/customization/data/styles/empty/Dial.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dial { id: control diff --git a/tests/auto/customization/data/styles/empty/Dialog.qml b/tests/auto/customization/data/styles/empty/Dialog.qml index a9729e47..72f95f0a 100644 --- a/tests/auto/customization/data/styles/empty/Dialog.qml +++ b/tests/auto/customization/data/styles/empty/Dialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dialog { id: control diff --git a/tests/auto/customization/data/styles/empty/DialogButtonBox.qml b/tests/auto/customization/data/styles/empty/DialogButtonBox.qml index 24bf95ca..1f47e83f 100644 --- a/tests/auto/customization/data/styles/empty/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/empty/DialogButtonBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DialogButtonBox { id: control diff --git a/tests/auto/customization/data/styles/empty/Drawer.qml b/tests/auto/customization/data/styles/empty/Drawer.qml index 3d8939f5..a550d5b7 100644 --- a/tests/auto/customization/data/styles/empty/Drawer.qml +++ b/tests/auto/customization/data/styles/empty/Drawer.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Drawer { id: control diff --git a/tests/auto/customization/data/styles/empty/Frame.qml b/tests/auto/customization/data/styles/empty/Frame.qml index 08b474a6..9047035c 100644 --- a/tests/auto/customization/data/styles/empty/Frame.qml +++ b/tests/auto/customization/data/styles/empty/Frame.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Frame { id: control diff --git a/tests/auto/customization/data/styles/empty/GroupBox.qml b/tests/auto/customization/data/styles/empty/GroupBox.qml index 933c995a..8628cb0d 100644 --- a/tests/auto/customization/data/styles/empty/GroupBox.qml +++ b/tests/auto/customization/data/styles/empty/GroupBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.GroupBox { id: control diff --git a/tests/auto/customization/data/styles/empty/ItemDelegate.qml b/tests/auto/customization/data/styles/empty/ItemDelegate.qml index d2ed1630..721e4b37 100644 --- a/tests/auto/customization/data/styles/empty/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/empty/ItemDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ItemDelegate { id: control diff --git a/tests/auto/customization/data/styles/empty/Label.qml b/tests/auto/customization/data/styles/empty/Label.qml index 806209d6..a0be5acf 100644 --- a/tests/auto/customization/data/styles/empty/Label.qml +++ b/tests/auto/customization/data/styles/empty/Label.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Label { id: control diff --git a/tests/auto/customization/data/styles/empty/Menu.qml b/tests/auto/customization/data/styles/empty/Menu.qml index acc73d90..ec7cd9fd 100644 --- a/tests/auto/customization/data/styles/empty/Menu.qml +++ b/tests/auto/customization/data/styles/empty/Menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Menu { id: control diff --git a/tests/auto/customization/data/styles/empty/MenuBar.qml b/tests/auto/customization/data/styles/empty/MenuBar.qml index 2499c0e7..6ee7350d 100644 --- a/tests/auto/customization/data/styles/empty/MenuBar.qml +++ b/tests/auto/customization/data/styles/empty/MenuBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBar { id: control diff --git a/tests/auto/customization/data/styles/empty/MenuBarItem.qml b/tests/auto/customization/data/styles/empty/MenuBarItem.qml index 641d1064..710c1208 100644 --- a/tests/auto/customization/data/styles/empty/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/empty/MenuBarItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBarItem { id: control diff --git a/tests/auto/customization/data/styles/empty/MenuItem.qml b/tests/auto/customization/data/styles/empty/MenuItem.qml index 5e4eb48e..206c2e89 100644 --- a/tests/auto/customization/data/styles/empty/MenuItem.qml +++ b/tests/auto/customization/data/styles/empty/MenuItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuItem { id: control diff --git a/tests/auto/customization/data/styles/empty/MenuSeparator.qml b/tests/auto/customization/data/styles/empty/MenuSeparator.qml index e3d5bf38..73b3ec41 100644 --- a/tests/auto/customization/data/styles/empty/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/empty/MenuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuSeparator { id: control diff --git a/tests/auto/customization/data/styles/empty/Page.qml b/tests/auto/customization/data/styles/empty/Page.qml index 306b7c69..ce77d17f 100644 --- a/tests/auto/customization/data/styles/empty/Page.qml +++ b/tests/auto/customization/data/styles/empty/Page.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Page { id: control diff --git a/tests/auto/customization/data/styles/empty/PageIndicator.qml b/tests/auto/customization/data/styles/empty/PageIndicator.qml index 56371529..c71e6908 100644 --- a/tests/auto/customization/data/styles/empty/PageIndicator.qml +++ b/tests/auto/customization/data/styles/empty/PageIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.PageIndicator { id: control diff --git a/tests/auto/customization/data/styles/empty/Pane.qml b/tests/auto/customization/data/styles/empty/Pane.qml index e05737b6..a710e9a2 100644 --- a/tests/auto/customization/data/styles/empty/Pane.qml +++ b/tests/auto/customization/data/styles/empty/Pane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Pane { id: control diff --git a/tests/auto/customization/data/styles/empty/Popup.qml b/tests/auto/customization/data/styles/empty/Popup.qml index 56013fc5..f2c19ed3 100644 --- a/tests/auto/customization/data/styles/empty/Popup.qml +++ b/tests/auto/customization/data/styles/empty/Popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Popup { id: control diff --git a/tests/auto/customization/data/styles/empty/ProgressBar.qml b/tests/auto/customization/data/styles/empty/ProgressBar.qml index 66507065..0ffdb015 100644 --- a/tests/auto/customization/data/styles/empty/ProgressBar.qml +++ b/tests/auto/customization/data/styles/empty/ProgressBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ProgressBar { id: control diff --git a/tests/auto/customization/data/styles/empty/RadioButton.qml b/tests/auto/customization/data/styles/empty/RadioButton.qml index 9763227b..1221e667 100644 --- a/tests/auto/customization/data/styles/empty/RadioButton.qml +++ b/tests/auto/customization/data/styles/empty/RadioButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioButton { id: control diff --git a/tests/auto/customization/data/styles/empty/RadioDelegate.qml b/tests/auto/customization/data/styles/empty/RadioDelegate.qml index 6c881794..b7889e34 100644 --- a/tests/auto/customization/data/styles/empty/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/empty/RadioDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioDelegate { id: control diff --git a/tests/auto/customization/data/styles/empty/RangeSlider.qml b/tests/auto/customization/data/styles/empty/RangeSlider.qml index c562d853..d737e4bf 100644 --- a/tests/auto/customization/data/styles/empty/RangeSlider.qml +++ b/tests/auto/customization/data/styles/empty/RangeSlider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RangeSlider { id: control diff --git a/tests/auto/customization/data/styles/empty/RoundButton.qml b/tests/auto/customization/data/styles/empty/RoundButton.qml index bae49ab0..01063900 100644 --- a/tests/auto/customization/data/styles/empty/RoundButton.qml +++ b/tests/auto/customization/data/styles/empty/RoundButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RoundButton { id: control diff --git a/tests/auto/customization/data/styles/empty/ScrollBar.qml b/tests/auto/customization/data/styles/empty/ScrollBar.qml index 005c70e1..bc727d7b 100644 --- a/tests/auto/customization/data/styles/empty/ScrollBar.qml +++ b/tests/auto/customization/data/styles/empty/ScrollBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollBar { id: control diff --git a/tests/auto/customization/data/styles/empty/ScrollIndicator.qml b/tests/auto/customization/data/styles/empty/ScrollIndicator.qml index 13d40d7d..3e11e721 100644 --- a/tests/auto/customization/data/styles/empty/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/empty/ScrollIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollIndicator { id: control diff --git a/tests/auto/customization/data/styles/empty/ScrollView.qml b/tests/auto/customization/data/styles/empty/ScrollView.qml index d67c6541..74a9fec2 100644 --- a/tests/auto/customization/data/styles/empty/ScrollView.qml +++ b/tests/auto/customization/data/styles/empty/ScrollView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollView { id: control diff --git a/tests/auto/customization/data/styles/empty/Slider.qml b/tests/auto/customization/data/styles/empty/Slider.qml index ec2bacf8..d8fe7aee 100644 --- a/tests/auto/customization/data/styles/empty/Slider.qml +++ b/tests/auto/customization/data/styles/empty/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Slider { id: control diff --git a/tests/auto/customization/data/styles/empty/SpinBox.qml b/tests/auto/customization/data/styles/empty/SpinBox.qml index 6e0f032b..4e84e55a 100644 --- a/tests/auto/customization/data/styles/empty/SpinBox.qml +++ b/tests/auto/customization/data/styles/empty/SpinBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SpinBox { id: control diff --git a/tests/auto/customization/data/styles/empty/StackView.qml b/tests/auto/customization/data/styles/empty/StackView.qml index 297152af..7722f8a7 100644 --- a/tests/auto/customization/data/styles/empty/StackView.qml +++ b/tests/auto/customization/data/styles/empty/StackView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.StackView { id: control diff --git a/tests/auto/customization/data/styles/empty/SwipeDelegate.qml b/tests/auto/customization/data/styles/empty/SwipeDelegate.qml index 15bdf3d3..f27802f4 100644 --- a/tests/auto/customization/data/styles/empty/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/empty/SwipeDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeDelegate { id: control diff --git a/tests/auto/customization/data/styles/empty/SwipeView.qml b/tests/auto/customization/data/styles/empty/SwipeView.qml index 73629a00..61de72b3 100644 --- a/tests/auto/customization/data/styles/empty/SwipeView.qml +++ b/tests/auto/customization/data/styles/empty/SwipeView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeView { id: control diff --git a/tests/auto/customization/data/styles/empty/Switch.qml b/tests/auto/customization/data/styles/empty/Switch.qml index cf991e01..3908d3f3 100644 --- a/tests/auto/customization/data/styles/empty/Switch.qml +++ b/tests/auto/customization/data/styles/empty/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Switch { id: control diff --git a/tests/auto/customization/data/styles/empty/SwitchDelegate.qml b/tests/auto/customization/data/styles/empty/SwitchDelegate.qml index 2aa1aacb..e581baa0 100644 --- a/tests/auto/customization/data/styles/empty/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/empty/SwitchDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwitchDelegate { id: control diff --git a/tests/auto/customization/data/styles/empty/TabBar.qml b/tests/auto/customization/data/styles/empty/TabBar.qml index 16cce091..caedefe9 100644 --- a/tests/auto/customization/data/styles/empty/TabBar.qml +++ b/tests/auto/customization/data/styles/empty/TabBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabBar { id: control diff --git a/tests/auto/customization/data/styles/empty/TabButton.qml b/tests/auto/customization/data/styles/empty/TabButton.qml index abc7c95a..e6777411 100644 --- a/tests/auto/customization/data/styles/empty/TabButton.qml +++ b/tests/auto/customization/data/styles/empty/TabButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabButton { id: control diff --git a/tests/auto/customization/data/styles/empty/TextArea.qml b/tests/auto/customization/data/styles/empty/TextArea.qml index 12330509..7d49af20 100644 --- a/tests/auto/customization/data/styles/empty/TextArea.qml +++ b/tests/auto/customization/data/styles/empty/TextArea.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextArea { id: control diff --git a/tests/auto/customization/data/styles/empty/TextField.qml b/tests/auto/customization/data/styles/empty/TextField.qml index 6e2f86ee..0a593cbe 100644 --- a/tests/auto/customization/data/styles/empty/TextField.qml +++ b/tests/auto/customization/data/styles/empty/TextField.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextField { id: control diff --git a/tests/auto/customization/data/styles/empty/ToolBar.qml b/tests/auto/customization/data/styles/empty/ToolBar.qml index f4e7c2ad..5f923267 100644 --- a/tests/auto/customization/data/styles/empty/ToolBar.qml +++ b/tests/auto/customization/data/styles/empty/ToolBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolBar { id: control diff --git a/tests/auto/customization/data/styles/empty/ToolButton.qml b/tests/auto/customization/data/styles/empty/ToolButton.qml index 3dc52753..9f209c55 100644 --- a/tests/auto/customization/data/styles/empty/ToolButton.qml +++ b/tests/auto/customization/data/styles/empty/ToolButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolButton { id: control diff --git a/tests/auto/customization/data/styles/empty/ToolSeparator.qml b/tests/auto/customization/data/styles/empty/ToolSeparator.qml index 4fdfc25e..bc81e3e7 100644 --- a/tests/auto/customization/data/styles/empty/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/empty/ToolSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolSeparator { id: control diff --git a/tests/auto/customization/data/styles/empty/ToolTip.qml b/tests/auto/customization/data/styles/empty/ToolTip.qml index ce8f5d85..0bc8e3c6 100644 --- a/tests/auto/customization/data/styles/empty/ToolTip.qml +++ b/tests/auto/customization/data/styles/empty/ToolTip.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolTip { id: control diff --git a/tests/auto/customization/data/styles/empty/Tumbler.qml b/tests/auto/customization/data/styles/empty/Tumbler.qml index af91a5c7..984362f4 100644 --- a/tests/auto/customization/data/styles/empty/Tumbler.qml +++ b/tests/auto/customization/data/styles/empty/Tumbler.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Tumbler { id: control diff --git a/tests/auto/customization/data/styles/identified/AbstractButton.qml b/tests/auto/customization/data/styles/identified/AbstractButton.qml index f390ae4b..b9656f7a 100644 --- a/tests/auto/customization/data/styles/identified/AbstractButton.qml +++ b/tests/auto/customization/data/styles/identified/AbstractButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.AbstractButton { id: control diff --git a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml b/tests/auto/customization/data/styles/identified/ApplicationWindow.qml index 9d5973f1..b77eebfc 100644 --- a/tests/auto/customization/data/styles/identified/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/identified/ApplicationWindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ApplicationWindow { id: control diff --git a/tests/auto/customization/data/styles/identified/BusyIndicator.qml b/tests/auto/customization/data/styles/identified/BusyIndicator.qml index 57a21ff9..dc4c14b7 100644 --- a/tests/auto/customization/data/styles/identified/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/identified/BusyIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.BusyIndicator { id: control diff --git a/tests/auto/customization/data/styles/identified/Button.qml b/tests/auto/customization/data/styles/identified/Button.qml index d92a106c..dca3b9d0 100644 --- a/tests/auto/customization/data/styles/identified/Button.qml +++ b/tests/auto/customization/data/styles/identified/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Button { id: control diff --git a/tests/auto/customization/data/styles/identified/CheckBox.qml b/tests/auto/customization/data/styles/identified/CheckBox.qml index f1a77f6f..8f1f9b25 100644 --- a/tests/auto/customization/data/styles/identified/CheckBox.qml +++ b/tests/auto/customization/data/styles/identified/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckBox { id: control diff --git a/tests/auto/customization/data/styles/identified/CheckDelegate.qml b/tests/auto/customization/data/styles/identified/CheckDelegate.qml index d5ec11b3..cfba67d3 100644 --- a/tests/auto/customization/data/styles/identified/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/identified/CheckDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/ComboBox.qml b/tests/auto/customization/data/styles/identified/ComboBox.qml index e3ee2a68..873d1c2a 100644 --- a/tests/auto/customization/data/styles/identified/ComboBox.qml +++ b/tests/auto/customization/data/styles/identified/ComboBox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Templates 2.12 as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/identified/Container.qml b/tests/auto/customization/data/styles/identified/Container.qml index eba77a02..8170e937 100644 --- a/tests/auto/customization/data/styles/identified/Container.qml +++ b/tests/auto/customization/data/styles/identified/Container.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Container { id: control diff --git a/tests/auto/customization/data/styles/identified/Control.qml b/tests/auto/customization/data/styles/identified/Control.qml index 2299d88f..0eb28c21 100644 --- a/tests/auto/customization/data/styles/identified/Control.qml +++ b/tests/auto/customization/data/styles/identified/Control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Control { id: control diff --git a/tests/auto/customization/data/styles/identified/DelayButton.qml b/tests/auto/customization/data/styles/identified/DelayButton.qml index 9879a261..fc7f67c9 100644 --- a/tests/auto/customization/data/styles/identified/DelayButton.qml +++ b/tests/auto/customization/data/styles/identified/DelayButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DelayButton { id: control diff --git a/tests/auto/customization/data/styles/identified/Dial.qml b/tests/auto/customization/data/styles/identified/Dial.qml index 50f387d3..423c64e2 100644 --- a/tests/auto/customization/data/styles/identified/Dial.qml +++ b/tests/auto/customization/data/styles/identified/Dial.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dial { id: control diff --git a/tests/auto/customization/data/styles/identified/Dialog.qml b/tests/auto/customization/data/styles/identified/Dialog.qml index acfc2e1d..58d0120e 100644 --- a/tests/auto/customization/data/styles/identified/Dialog.qml +++ b/tests/auto/customization/data/styles/identified/Dialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dialog { id: control diff --git a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml b/tests/auto/customization/data/styles/identified/DialogButtonBox.qml index 7b1bd04a..0bf56268 100644 --- a/tests/auto/customization/data/styles/identified/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/identified/DialogButtonBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DialogButtonBox { id: control diff --git a/tests/auto/customization/data/styles/identified/Drawer.qml b/tests/auto/customization/data/styles/identified/Drawer.qml index 42e3829e..82d09bd4 100644 --- a/tests/auto/customization/data/styles/identified/Drawer.qml +++ b/tests/auto/customization/data/styles/identified/Drawer.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Drawer { id: control diff --git a/tests/auto/customization/data/styles/identified/Frame.qml b/tests/auto/customization/data/styles/identified/Frame.qml index f3875eb7..e84e18b1 100644 --- a/tests/auto/customization/data/styles/identified/Frame.qml +++ b/tests/auto/customization/data/styles/identified/Frame.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Frame { id: control diff --git a/tests/auto/customization/data/styles/identified/GroupBox.qml b/tests/auto/customization/data/styles/identified/GroupBox.qml index 5d77b27a..ed56f89b 100644 --- a/tests/auto/customization/data/styles/identified/GroupBox.qml +++ b/tests/auto/customization/data/styles/identified/GroupBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.GroupBox { id: control diff --git a/tests/auto/customization/data/styles/identified/ItemDelegate.qml b/tests/auto/customization/data/styles/identified/ItemDelegate.qml index 3ef8396b..92801c53 100644 --- a/tests/auto/customization/data/styles/identified/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/identified/ItemDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ItemDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/Label.qml b/tests/auto/customization/data/styles/identified/Label.qml index d10ee1dd..d19da135 100644 --- a/tests/auto/customization/data/styles/identified/Label.qml +++ b/tests/auto/customization/data/styles/identified/Label.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Label { id: control diff --git a/tests/auto/customization/data/styles/identified/Menu.qml b/tests/auto/customization/data/styles/identified/Menu.qml index cb0e52e9..5a9ac617 100644 --- a/tests/auto/customization/data/styles/identified/Menu.qml +++ b/tests/auto/customization/data/styles/identified/Menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Menu { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuBar.qml b/tests/auto/customization/data/styles/identified/MenuBar.qml index 596660fb..d846e3c9 100644 --- a/tests/auto/customization/data/styles/identified/MenuBar.qml +++ b/tests/auto/customization/data/styles/identified/MenuBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBar { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuBarItem.qml b/tests/auto/customization/data/styles/identified/MenuBarItem.qml index ada9d094..94fdef89 100644 --- a/tests/auto/customization/data/styles/identified/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/identified/MenuBarItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBarItem { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuItem.qml b/tests/auto/customization/data/styles/identified/MenuItem.qml index 40c293cd..34f12cca 100644 --- a/tests/auto/customization/data/styles/identified/MenuItem.qml +++ b/tests/auto/customization/data/styles/identified/MenuItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuItem { id: control diff --git a/tests/auto/customization/data/styles/identified/MenuSeparator.qml b/tests/auto/customization/data/styles/identified/MenuSeparator.qml index c82ea4f3..14154e2f 100644 --- a/tests/auto/customization/data/styles/identified/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/identified/MenuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuSeparator { id: control diff --git a/tests/auto/customization/data/styles/identified/Page.qml b/tests/auto/customization/data/styles/identified/Page.qml index 5c8cf73e..945f2ac7 100644 --- a/tests/auto/customization/data/styles/identified/Page.qml +++ b/tests/auto/customization/data/styles/identified/Page.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Page { id: control diff --git a/tests/auto/customization/data/styles/identified/PageIndicator.qml b/tests/auto/customization/data/styles/identified/PageIndicator.qml index 92f28b39..ef0ab44f 100644 --- a/tests/auto/customization/data/styles/identified/PageIndicator.qml +++ b/tests/auto/customization/data/styles/identified/PageIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.PageIndicator { id: control diff --git a/tests/auto/customization/data/styles/identified/Pane.qml b/tests/auto/customization/data/styles/identified/Pane.qml index a0315788..849c7907 100644 --- a/tests/auto/customization/data/styles/identified/Pane.qml +++ b/tests/auto/customization/data/styles/identified/Pane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Pane { id: control diff --git a/tests/auto/customization/data/styles/identified/Popup.qml b/tests/auto/customization/data/styles/identified/Popup.qml index b19b1251..65de416c 100644 --- a/tests/auto/customization/data/styles/identified/Popup.qml +++ b/tests/auto/customization/data/styles/identified/Popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Popup { id: control diff --git a/tests/auto/customization/data/styles/identified/ProgressBar.qml b/tests/auto/customization/data/styles/identified/ProgressBar.qml index 6f22a986..24888624 100644 --- a/tests/auto/customization/data/styles/identified/ProgressBar.qml +++ b/tests/auto/customization/data/styles/identified/ProgressBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ProgressBar { id: control diff --git a/tests/auto/customization/data/styles/identified/RadioButton.qml b/tests/auto/customization/data/styles/identified/RadioButton.qml index 356a9cdd..3a0c4e44 100644 --- a/tests/auto/customization/data/styles/identified/RadioButton.qml +++ b/tests/auto/customization/data/styles/identified/RadioButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioButton { id: control diff --git a/tests/auto/customization/data/styles/identified/RadioDelegate.qml b/tests/auto/customization/data/styles/identified/RadioDelegate.qml index 2af8728a..3eda2408 100644 --- a/tests/auto/customization/data/styles/identified/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/identified/RadioDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/RangeSlider.qml b/tests/auto/customization/data/styles/identified/RangeSlider.qml index 02f2df4d..18118dbe 100644 --- a/tests/auto/customization/data/styles/identified/RangeSlider.qml +++ b/tests/auto/customization/data/styles/identified/RangeSlider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RangeSlider { id: control diff --git a/tests/auto/customization/data/styles/identified/RoundButton.qml b/tests/auto/customization/data/styles/identified/RoundButton.qml index f8d56d7c..fc6bc95a 100644 --- a/tests/auto/customization/data/styles/identified/RoundButton.qml +++ b/tests/auto/customization/data/styles/identified/RoundButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RoundButton { id: control diff --git a/tests/auto/customization/data/styles/identified/ScrollBar.qml b/tests/auto/customization/data/styles/identified/ScrollBar.qml index c07132db..f9a4445d 100644 --- a/tests/auto/customization/data/styles/identified/ScrollBar.qml +++ b/tests/auto/customization/data/styles/identified/ScrollBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollBar { id: control diff --git a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml b/tests/auto/customization/data/styles/identified/ScrollIndicator.qml index 91cbe662..0f15aa2d 100644 --- a/tests/auto/customization/data/styles/identified/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/identified/ScrollIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollIndicator { id: control diff --git a/tests/auto/customization/data/styles/identified/ScrollView.qml b/tests/auto/customization/data/styles/identified/ScrollView.qml index 983e00f7..0855a5af 100644 --- a/tests/auto/customization/data/styles/identified/ScrollView.qml +++ b/tests/auto/customization/data/styles/identified/ScrollView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollView { id: control diff --git a/tests/auto/customization/data/styles/identified/Slider.qml b/tests/auto/customization/data/styles/identified/Slider.qml index 71bea7d3..23afb67e 100644 --- a/tests/auto/customization/data/styles/identified/Slider.qml +++ b/tests/auto/customization/data/styles/identified/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Slider { id: control diff --git a/tests/auto/customization/data/styles/identified/SpinBox.qml b/tests/auto/customization/data/styles/identified/SpinBox.qml index 1b044b82..7871c975 100644 --- a/tests/auto/customization/data/styles/identified/SpinBox.qml +++ b/tests/auto/customization/data/styles/identified/SpinBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SpinBox { id: control diff --git a/tests/auto/customization/data/styles/identified/StackView.qml b/tests/auto/customization/data/styles/identified/StackView.qml index e227b6b2..20459d99 100644 --- a/tests/auto/customization/data/styles/identified/StackView.qml +++ b/tests/auto/customization/data/styles/identified/StackView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.StackView { id: control diff --git a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml b/tests/auto/customization/data/styles/identified/SwipeDelegate.qml index 483273c8..e60780f5 100644 --- a/tests/auto/customization/data/styles/identified/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/identified/SwipeDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/SwipeView.qml b/tests/auto/customization/data/styles/identified/SwipeView.qml index ecb74803..0e5a19f6 100644 --- a/tests/auto/customization/data/styles/identified/SwipeView.qml +++ b/tests/auto/customization/data/styles/identified/SwipeView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeView { id: control diff --git a/tests/auto/customization/data/styles/identified/Switch.qml b/tests/auto/customization/data/styles/identified/Switch.qml index dcdbfdf9..f7e22f1f 100644 --- a/tests/auto/customization/data/styles/identified/Switch.qml +++ b/tests/auto/customization/data/styles/identified/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Switch { id: control diff --git a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml b/tests/auto/customization/data/styles/identified/SwitchDelegate.qml index 7eb87698..bda30715 100644 --- a/tests/auto/customization/data/styles/identified/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/identified/SwitchDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwitchDelegate { id: control diff --git a/tests/auto/customization/data/styles/identified/TabBar.qml b/tests/auto/customization/data/styles/identified/TabBar.qml index d79257a1..3589f505 100644 --- a/tests/auto/customization/data/styles/identified/TabBar.qml +++ b/tests/auto/customization/data/styles/identified/TabBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabBar { id: control diff --git a/tests/auto/customization/data/styles/identified/TabButton.qml b/tests/auto/customization/data/styles/identified/TabButton.qml index 0bef790a..cc24fdfe 100644 --- a/tests/auto/customization/data/styles/identified/TabButton.qml +++ b/tests/auto/customization/data/styles/identified/TabButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabButton { id: control diff --git a/tests/auto/customization/data/styles/identified/TextArea.qml b/tests/auto/customization/data/styles/identified/TextArea.qml index 160bd264..c7ef2545 100644 --- a/tests/auto/customization/data/styles/identified/TextArea.qml +++ b/tests/auto/customization/data/styles/identified/TextArea.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextArea { id: control diff --git a/tests/auto/customization/data/styles/identified/TextField.qml b/tests/auto/customization/data/styles/identified/TextField.qml index 02fcbf20..670fa9f7 100644 --- a/tests/auto/customization/data/styles/identified/TextField.qml +++ b/tests/auto/customization/data/styles/identified/TextField.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextField { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolBar.qml b/tests/auto/customization/data/styles/identified/ToolBar.qml index af571bb9..950f0c53 100644 --- a/tests/auto/customization/data/styles/identified/ToolBar.qml +++ b/tests/auto/customization/data/styles/identified/ToolBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolBar { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolButton.qml b/tests/auto/customization/data/styles/identified/ToolButton.qml index c5f875e0..792de9e5 100644 --- a/tests/auto/customization/data/styles/identified/ToolButton.qml +++ b/tests/auto/customization/data/styles/identified/ToolButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolButton { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolSeparator.qml b/tests/auto/customization/data/styles/identified/ToolSeparator.qml index f682e35f..a44fb331 100644 --- a/tests/auto/customization/data/styles/identified/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/identified/ToolSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolSeparator { id: control diff --git a/tests/auto/customization/data/styles/identified/ToolTip.qml b/tests/auto/customization/data/styles/identified/ToolTip.qml index efe727e8..5ddf8920 100644 --- a/tests/auto/customization/data/styles/identified/ToolTip.qml +++ b/tests/auto/customization/data/styles/identified/ToolTip.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolTip { id: control diff --git a/tests/auto/customization/data/styles/identified/Tumbler.qml b/tests/auto/customization/data/styles/identified/Tumbler.qml index faef7125..ae123f08 100644 --- a/tests/auto/customization/data/styles/identified/Tumbler.qml +++ b/tests/auto/customization/data/styles/identified/Tumbler.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Tumbler { id: control diff --git a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml b/tests/auto/customization/data/styles/incomplete/AbstractButton.qml index 7b6dd3cc..ee78f032 100644 --- a/tests/auto/customization/data/styles/incomplete/AbstractButton.qml +++ b/tests/auto/customization/data/styles/incomplete/AbstractButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.AbstractButton { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml b/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml index d074c46c..45abc542 100644 --- a/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/incomplete/ApplicationWindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ApplicationWindow { id: control diff --git a/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml b/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml index 8f4e7fb1..e9a78add 100644 --- a/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/incomplete/BusyIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.BusyIndicator { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Button.qml b/tests/auto/customization/data/styles/incomplete/Button.qml index 8622d978..52f1e2f2 100644 --- a/tests/auto/customization/data/styles/incomplete/Button.qml +++ b/tests/auto/customization/data/styles/incomplete/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Button { id: control diff --git a/tests/auto/customization/data/styles/incomplete/CheckBox.qml b/tests/auto/customization/data/styles/incomplete/CheckBox.qml index 3c299892..c599ca93 100644 --- a/tests/auto/customization/data/styles/incomplete/CheckBox.qml +++ b/tests/auto/customization/data/styles/incomplete/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckBox { id: control diff --git a/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml b/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml index 16ce3e00..673dbbd9 100644 --- a/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/CheckDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckDelegate { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ComboBox.qml b/tests/auto/customization/data/styles/incomplete/ComboBox.qml index 690c093c..ef595e4f 100644 --- a/tests/auto/customization/data/styles/incomplete/ComboBox.qml +++ b/tests/auto/customization/data/styles/incomplete/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Container.qml b/tests/auto/customization/data/styles/incomplete/Container.qml index 30eef1d9..9b18ae49 100644 --- a/tests/auto/customization/data/styles/incomplete/Container.qml +++ b/tests/auto/customization/data/styles/incomplete/Container.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Container { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Control.qml b/tests/auto/customization/data/styles/incomplete/Control.qml index fecf86b2..ccec0bf0 100644 --- a/tests/auto/customization/data/styles/incomplete/Control.qml +++ b/tests/auto/customization/data/styles/incomplete/Control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Control { id: control diff --git a/tests/auto/customization/data/styles/incomplete/DelayButton.qml b/tests/auto/customization/data/styles/incomplete/DelayButton.qml index d0823e6d..bb21db26 100644 --- a/tests/auto/customization/data/styles/incomplete/DelayButton.qml +++ b/tests/auto/customization/data/styles/incomplete/DelayButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DelayButton { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Dial.qml b/tests/auto/customization/data/styles/incomplete/Dial.qml index bc318f72..e9de0974 100644 --- a/tests/auto/customization/data/styles/incomplete/Dial.qml +++ b/tests/auto/customization/data/styles/incomplete/Dial.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dial { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Dialog.qml b/tests/auto/customization/data/styles/incomplete/Dialog.qml index 17dba80d..9f8ad1fa 100644 --- a/tests/auto/customization/data/styles/incomplete/Dialog.qml +++ b/tests/auto/customization/data/styles/incomplete/Dialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dialog { id: control diff --git a/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml b/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml index 64ebb3c6..7dfaadf5 100644 --- a/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/incomplete/DialogButtonBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DialogButtonBox { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Drawer.qml b/tests/auto/customization/data/styles/incomplete/Drawer.qml index c8083fb8..684221e5 100644 --- a/tests/auto/customization/data/styles/incomplete/Drawer.qml +++ b/tests/auto/customization/data/styles/incomplete/Drawer.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Drawer { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Frame.qml b/tests/auto/customization/data/styles/incomplete/Frame.qml index ee2092c5..9f409cfd 100644 --- a/tests/auto/customization/data/styles/incomplete/Frame.qml +++ b/tests/auto/customization/data/styles/incomplete/Frame.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Frame { id: control diff --git a/tests/auto/customization/data/styles/incomplete/GroupBox.qml b/tests/auto/customization/data/styles/incomplete/GroupBox.qml index ef66ee74..4c5b258e 100644 --- a/tests/auto/customization/data/styles/incomplete/GroupBox.qml +++ b/tests/auto/customization/data/styles/incomplete/GroupBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.GroupBox { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml b/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml index b2be8537..39063eb3 100644 --- a/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/ItemDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ItemDelegate { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Label.qml b/tests/auto/customization/data/styles/incomplete/Label.qml index 21563a12..3a953004 100644 --- a/tests/auto/customization/data/styles/incomplete/Label.qml +++ b/tests/auto/customization/data/styles/incomplete/Label.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Label { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Menu.qml b/tests/auto/customization/data/styles/incomplete/Menu.qml index 8027b1db..ca03cfe4 100644 --- a/tests/auto/customization/data/styles/incomplete/Menu.qml +++ b/tests/auto/customization/data/styles/incomplete/Menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Menu { id: control diff --git a/tests/auto/customization/data/styles/incomplete/MenuBar.qml b/tests/auto/customization/data/styles/incomplete/MenuBar.qml index dc2b03cc..bc98d4c8 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuBar.qml +++ b/tests/auto/customization/data/styles/incomplete/MenuBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBar { id: control diff --git a/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml b/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml index f46689ab..6b1dbc2e 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/incomplete/MenuBarItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBarItem { id: control diff --git a/tests/auto/customization/data/styles/incomplete/MenuItem.qml b/tests/auto/customization/data/styles/incomplete/MenuItem.qml index 708ec628..40539eaf 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuItem.qml +++ b/tests/auto/customization/data/styles/incomplete/MenuItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuItem { id: control diff --git a/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml b/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml index a93e2716..eb799f31 100644 --- a/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/incomplete/MenuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuSeparator { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Page.qml b/tests/auto/customization/data/styles/incomplete/Page.qml index 8ffcb3a0..22964846 100644 --- a/tests/auto/customization/data/styles/incomplete/Page.qml +++ b/tests/auto/customization/data/styles/incomplete/Page.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Page { id: control diff --git a/tests/auto/customization/data/styles/incomplete/PageIndicator.qml b/tests/auto/customization/data/styles/incomplete/PageIndicator.qml index 972ff4f9..87cd3637 100644 --- a/tests/auto/customization/data/styles/incomplete/PageIndicator.qml +++ b/tests/auto/customization/data/styles/incomplete/PageIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.PageIndicator { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Pane.qml b/tests/auto/customization/data/styles/incomplete/Pane.qml index 0d3bd873..f4c96887 100644 --- a/tests/auto/customization/data/styles/incomplete/Pane.qml +++ b/tests/auto/customization/data/styles/incomplete/Pane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Pane { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Popup.qml b/tests/auto/customization/data/styles/incomplete/Popup.qml index d268405e..fbba7f50 100644 --- a/tests/auto/customization/data/styles/incomplete/Popup.qml +++ b/tests/auto/customization/data/styles/incomplete/Popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Popup { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ProgressBar.qml b/tests/auto/customization/data/styles/incomplete/ProgressBar.qml index 96959665..0186fa4e 100644 --- a/tests/auto/customization/data/styles/incomplete/ProgressBar.qml +++ b/tests/auto/customization/data/styles/incomplete/ProgressBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ProgressBar { id: control diff --git a/tests/auto/customization/data/styles/incomplete/RadioButton.qml b/tests/auto/customization/data/styles/incomplete/RadioButton.qml index 28b62af9..fcd31ca6 100644 --- a/tests/auto/customization/data/styles/incomplete/RadioButton.qml +++ b/tests/auto/customization/data/styles/incomplete/RadioButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioButton { id: control diff --git a/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml b/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml index b833e8a3..b64c0cab 100644 --- a/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/RadioDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioDelegate { id: control diff --git a/tests/auto/customization/data/styles/incomplete/RangeSlider.qml b/tests/auto/customization/data/styles/incomplete/RangeSlider.qml index 3bc3dfcb..c0faec20 100644 --- a/tests/auto/customization/data/styles/incomplete/RangeSlider.qml +++ b/tests/auto/customization/data/styles/incomplete/RangeSlider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RangeSlider { id: control diff --git a/tests/auto/customization/data/styles/incomplete/RoundButton.qml b/tests/auto/customization/data/styles/incomplete/RoundButton.qml index 2d771f58..ddb24e3d 100644 --- a/tests/auto/customization/data/styles/incomplete/RoundButton.qml +++ b/tests/auto/customization/data/styles/incomplete/RoundButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RoundButton { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ScrollBar.qml b/tests/auto/customization/data/styles/incomplete/ScrollBar.qml index c726c7ad..a79c4daa 100644 --- a/tests/auto/customization/data/styles/incomplete/ScrollBar.qml +++ b/tests/auto/customization/data/styles/incomplete/ScrollBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollBar { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml b/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml index 724060d3..2401fbe5 100644 --- a/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/incomplete/ScrollIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollIndicator { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ScrollView.qml b/tests/auto/customization/data/styles/incomplete/ScrollView.qml index 48088a67..736ea7b1 100644 --- a/tests/auto/customization/data/styles/incomplete/ScrollView.qml +++ b/tests/auto/customization/data/styles/incomplete/ScrollView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollView { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Slider.qml b/tests/auto/customization/data/styles/incomplete/Slider.qml index 54978965..b4ede96f 100644 --- a/tests/auto/customization/data/styles/incomplete/Slider.qml +++ b/tests/auto/customization/data/styles/incomplete/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Slider { id: control diff --git a/tests/auto/customization/data/styles/incomplete/SpinBox.qml b/tests/auto/customization/data/styles/incomplete/SpinBox.qml index 33d59829..6303ab06 100644 --- a/tests/auto/customization/data/styles/incomplete/SpinBox.qml +++ b/tests/auto/customization/data/styles/incomplete/SpinBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SpinBox { id: control diff --git a/tests/auto/customization/data/styles/incomplete/StackView.qml b/tests/auto/customization/data/styles/incomplete/StackView.qml index 7199f6b2..b163a594 100644 --- a/tests/auto/customization/data/styles/incomplete/StackView.qml +++ b/tests/auto/customization/data/styles/incomplete/StackView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.StackView { id: control diff --git a/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml b/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml index 1b59f0b0..a64b0fae 100644 --- a/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/SwipeDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeDelegate { id: control diff --git a/tests/auto/customization/data/styles/incomplete/SwipeView.qml b/tests/auto/customization/data/styles/incomplete/SwipeView.qml index dd1c39ea..07891063 100644 --- a/tests/auto/customization/data/styles/incomplete/SwipeView.qml +++ b/tests/auto/customization/data/styles/incomplete/SwipeView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeView { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Switch.qml b/tests/auto/customization/data/styles/incomplete/Switch.qml index 94f6cd8b..53e41149 100644 --- a/tests/auto/customization/data/styles/incomplete/Switch.qml +++ b/tests/auto/customization/data/styles/incomplete/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Switch { id: control diff --git a/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml b/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml index fa1b9831..c9be903f 100644 --- a/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/incomplete/SwitchDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwitchDelegate { id: control diff --git a/tests/auto/customization/data/styles/incomplete/TabBar.qml b/tests/auto/customization/data/styles/incomplete/TabBar.qml index b3bc29f4..1a55af4d 100644 --- a/tests/auto/customization/data/styles/incomplete/TabBar.qml +++ b/tests/auto/customization/data/styles/incomplete/TabBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabBar { id: control diff --git a/tests/auto/customization/data/styles/incomplete/TabButton.qml b/tests/auto/customization/data/styles/incomplete/TabButton.qml index bd5c6aab..e2e88a99 100644 --- a/tests/auto/customization/data/styles/incomplete/TabButton.qml +++ b/tests/auto/customization/data/styles/incomplete/TabButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabButton { id: control diff --git a/tests/auto/customization/data/styles/incomplete/TextArea.qml b/tests/auto/customization/data/styles/incomplete/TextArea.qml index 6bd66f1f..cf56e5a0 100644 --- a/tests/auto/customization/data/styles/incomplete/TextArea.qml +++ b/tests/auto/customization/data/styles/incomplete/TextArea.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextArea { id: control diff --git a/tests/auto/customization/data/styles/incomplete/TextField.qml b/tests/auto/customization/data/styles/incomplete/TextField.qml index 5ccaedec..66f8372b 100644 --- a/tests/auto/customization/data/styles/incomplete/TextField.qml +++ b/tests/auto/customization/data/styles/incomplete/TextField.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextField { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ToolBar.qml b/tests/auto/customization/data/styles/incomplete/ToolBar.qml index 6538b9eb..a665bd25 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolBar.qml +++ b/tests/auto/customization/data/styles/incomplete/ToolBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolBar { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ToolButton.qml b/tests/auto/customization/data/styles/incomplete/ToolButton.qml index b267cedc..3fa51246 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolButton.qml +++ b/tests/auto/customization/data/styles/incomplete/ToolButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolButton { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml b/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml index 6cef1c64..17b26d7c 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/incomplete/ToolSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolSeparator { id: control diff --git a/tests/auto/customization/data/styles/incomplete/ToolTip.qml b/tests/auto/customization/data/styles/incomplete/ToolTip.qml index 9a22ad06..7aee3648 100644 --- a/tests/auto/customization/data/styles/incomplete/ToolTip.qml +++ b/tests/auto/customization/data/styles/incomplete/ToolTip.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolTip { id: control diff --git a/tests/auto/customization/data/styles/incomplete/Tumbler.qml b/tests/auto/customization/data/styles/incomplete/Tumbler.qml index fa173239..cda24bc2 100644 --- a/tests/auto/customization/data/styles/incomplete/Tumbler.qml +++ b/tests/auto/customization/data/styles/incomplete/Tumbler.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Tumbler { id: control diff --git a/tests/auto/customization/data/styles/override/AbstractButton.qml b/tests/auto/customization/data/styles/override/AbstractButton.qml index 602f7930..398b51b7 100644 --- a/tests/auto/customization/data/styles/override/AbstractButton.qml +++ b/tests/auto/customization/data/styles/override/AbstractButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.AbstractButton { diff --git a/tests/auto/customization/data/styles/override/ApplicationWindow.qml b/tests/auto/customization/data/styles/override/ApplicationWindow.qml index f5b73624..7a760574 100644 --- a/tests/auto/customization/data/styles/override/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/override/ApplicationWindow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ApplicationWindow { diff --git a/tests/auto/customization/data/styles/override/BusyIndicator.qml b/tests/auto/customization/data/styles/override/BusyIndicator.qml index b4478a2f..2b70548f 100644 --- a/tests/auto/customization/data/styles/override/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/override/BusyIndicator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.BusyIndicator { diff --git a/tests/auto/customization/data/styles/override/Button.qml b/tests/auto/customization/data/styles/override/Button.qml index b8563b27..35f260c3 100644 --- a/tests/auto/customization/data/styles/override/Button.qml +++ b/tests/auto/customization/data/styles/override/Button.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Button { diff --git a/tests/auto/customization/data/styles/override/CheckBox.qml b/tests/auto/customization/data/styles/override/CheckBox.qml index dfaba8a4..857b86ea 100644 --- a/tests/auto/customization/data/styles/override/CheckBox.qml +++ b/tests/auto/customization/data/styles/override/CheckBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.CheckBox { diff --git a/tests/auto/customization/data/styles/override/CheckDelegate.qml b/tests/auto/customization/data/styles/override/CheckDelegate.qml index 05d6ea11..17e0ed48 100644 --- a/tests/auto/customization/data/styles/override/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/override/CheckDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.CheckDelegate { diff --git a/tests/auto/customization/data/styles/override/ComboBox.qml b/tests/auto/customization/data/styles/override/ComboBox.qml index 1651e294..a41e4674 100644 --- a/tests/auto/customization/data/styles/override/ComboBox.qml +++ b/tests/auto/customization/data/styles/override/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T import "../simple" as Simple Simple.ComboBox { diff --git a/tests/auto/customization/data/styles/override/Container.qml b/tests/auto/customization/data/styles/override/Container.qml index 830c7ded..d4d6c189 100644 --- a/tests/auto/customization/data/styles/override/Container.qml +++ b/tests/auto/customization/data/styles/override/Container.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Container { diff --git a/tests/auto/customization/data/styles/override/Control.qml b/tests/auto/customization/data/styles/override/Control.qml index 7d561b05..fc6acb8f 100644 --- a/tests/auto/customization/data/styles/override/Control.qml +++ b/tests/auto/customization/data/styles/override/Control.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Control { diff --git a/tests/auto/customization/data/styles/override/DelayButton.qml b/tests/auto/customization/data/styles/override/DelayButton.qml index 69dfba2d..69fcf49d 100644 --- a/tests/auto/customization/data/styles/override/DelayButton.qml +++ b/tests/auto/customization/data/styles/override/DelayButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.DelayButton { diff --git a/tests/auto/customization/data/styles/override/Dial.qml b/tests/auto/customization/data/styles/override/Dial.qml index 4b84a30a..484f8c3f 100644 --- a/tests/auto/customization/data/styles/override/Dial.qml +++ b/tests/auto/customization/data/styles/override/Dial.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Dial { diff --git a/tests/auto/customization/data/styles/override/Dialog.qml b/tests/auto/customization/data/styles/override/Dialog.qml index 820bdae8..81798a39 100644 --- a/tests/auto/customization/data/styles/override/Dialog.qml +++ b/tests/auto/customization/data/styles/override/Dialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Dialog { diff --git a/tests/auto/customization/data/styles/override/DialogButtonBox.qml b/tests/auto/customization/data/styles/override/DialogButtonBox.qml index 1be2354a..5ab315d4 100644 --- a/tests/auto/customization/data/styles/override/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/override/DialogButtonBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.DialogButtonBox { diff --git a/tests/auto/customization/data/styles/override/Drawer.qml b/tests/auto/customization/data/styles/override/Drawer.qml index 5fc918c7..943522e7 100644 --- a/tests/auto/customization/data/styles/override/Drawer.qml +++ b/tests/auto/customization/data/styles/override/Drawer.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Drawer { diff --git a/tests/auto/customization/data/styles/override/Frame.qml b/tests/auto/customization/data/styles/override/Frame.qml index c99b7bd2..b3b589b5 100644 --- a/tests/auto/customization/data/styles/override/Frame.qml +++ b/tests/auto/customization/data/styles/override/Frame.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Frame { diff --git a/tests/auto/customization/data/styles/override/GroupBox.qml b/tests/auto/customization/data/styles/override/GroupBox.qml index ea5fa2c6..570bc63e 100644 --- a/tests/auto/customization/data/styles/override/GroupBox.qml +++ b/tests/auto/customization/data/styles/override/GroupBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.GroupBox { diff --git a/tests/auto/customization/data/styles/override/ItemDelegate.qml b/tests/auto/customization/data/styles/override/ItemDelegate.qml index ddec79d2..6b2fd928 100644 --- a/tests/auto/customization/data/styles/override/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/override/ItemDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ItemDelegate { diff --git a/tests/auto/customization/data/styles/override/Label.qml b/tests/auto/customization/data/styles/override/Label.qml index 15e070b5..249a9e99 100644 --- a/tests/auto/customization/data/styles/override/Label.qml +++ b/tests/auto/customization/data/styles/override/Label.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Label { diff --git a/tests/auto/customization/data/styles/override/Menu.qml b/tests/auto/customization/data/styles/override/Menu.qml index 891de1bd..4e10c480 100644 --- a/tests/auto/customization/data/styles/override/Menu.qml +++ b/tests/auto/customization/data/styles/override/Menu.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Menu { diff --git a/tests/auto/customization/data/styles/override/MenuBar.qml b/tests/auto/customization/data/styles/override/MenuBar.qml index deefe496..baeef209 100644 --- a/tests/auto/customization/data/styles/override/MenuBar.qml +++ b/tests/auto/customization/data/styles/override/MenuBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import "../simple" as Simple Simple.MenuBar { diff --git a/tests/auto/customization/data/styles/override/MenuBarItem.qml b/tests/auto/customization/data/styles/override/MenuBarItem.qml index af318830..a76ca190 100644 --- a/tests/auto/customization/data/styles/override/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/override/MenuBarItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import "../simple" as Simple Simple.MenuBarItem { diff --git a/tests/auto/customization/data/styles/override/MenuItem.qml b/tests/auto/customization/data/styles/override/MenuItem.qml index 2259e739..ee10e1ba 100644 --- a/tests/auto/customization/data/styles/override/MenuItem.qml +++ b/tests/auto/customization/data/styles/override/MenuItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.MenuItem { diff --git a/tests/auto/customization/data/styles/override/MenuSeparator.qml b/tests/auto/customization/data/styles/override/MenuSeparator.qml index 49ae9ee7..c60cedea 100644 --- a/tests/auto/customization/data/styles/override/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/override/MenuSeparator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.MenuSeparator { diff --git a/tests/auto/customization/data/styles/override/Page.qml b/tests/auto/customization/data/styles/override/Page.qml index 8edb5dac..9f85d9e9 100644 --- a/tests/auto/customization/data/styles/override/Page.qml +++ b/tests/auto/customization/data/styles/override/Page.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Page { diff --git a/tests/auto/customization/data/styles/override/PageIndicator.qml b/tests/auto/customization/data/styles/override/PageIndicator.qml index 9abbc348..1d1e20ed 100644 --- a/tests/auto/customization/data/styles/override/PageIndicator.qml +++ b/tests/auto/customization/data/styles/override/PageIndicator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.PageIndicator { diff --git a/tests/auto/customization/data/styles/override/Pane.qml b/tests/auto/customization/data/styles/override/Pane.qml index a88648f6..fb56cc07 100644 --- a/tests/auto/customization/data/styles/override/Pane.qml +++ b/tests/auto/customization/data/styles/override/Pane.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Pane { diff --git a/tests/auto/customization/data/styles/override/Popup.qml b/tests/auto/customization/data/styles/override/Popup.qml index 96f00eb0..54e8a4f7 100644 --- a/tests/auto/customization/data/styles/override/Popup.qml +++ b/tests/auto/customization/data/styles/override/Popup.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Popup { diff --git a/tests/auto/customization/data/styles/override/ProgressBar.qml b/tests/auto/customization/data/styles/override/ProgressBar.qml index 52c347a7..ce0623f2 100644 --- a/tests/auto/customization/data/styles/override/ProgressBar.qml +++ b/tests/auto/customization/data/styles/override/ProgressBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ProgressBar { diff --git a/tests/auto/customization/data/styles/override/RadioButton.qml b/tests/auto/customization/data/styles/override/RadioButton.qml index 42397f08..c435b3d9 100644 --- a/tests/auto/customization/data/styles/override/RadioButton.qml +++ b/tests/auto/customization/data/styles/override/RadioButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.RadioButton { diff --git a/tests/auto/customization/data/styles/override/RadioDelegate.qml b/tests/auto/customization/data/styles/override/RadioDelegate.qml index a4f5a9a5..2659800e 100644 --- a/tests/auto/customization/data/styles/override/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/override/RadioDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.RadioDelegate { diff --git a/tests/auto/customization/data/styles/override/RangeSlider.qml b/tests/auto/customization/data/styles/override/RangeSlider.qml index 575926e5..7c8cdbbc 100644 --- a/tests/auto/customization/data/styles/override/RangeSlider.qml +++ b/tests/auto/customization/data/styles/override/RangeSlider.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.RangeSlider { diff --git a/tests/auto/customization/data/styles/override/RoundButton.qml b/tests/auto/customization/data/styles/override/RoundButton.qml index e0573334..233d0c30 100644 --- a/tests/auto/customization/data/styles/override/RoundButton.qml +++ b/tests/auto/customization/data/styles/override/RoundButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.RoundButton { diff --git a/tests/auto/customization/data/styles/override/ScrollBar.qml b/tests/auto/customization/data/styles/override/ScrollBar.qml index 8853cf1c..69fc08f6 100644 --- a/tests/auto/customization/data/styles/override/ScrollBar.qml +++ b/tests/auto/customization/data/styles/override/ScrollBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ScrollBar { diff --git a/tests/auto/customization/data/styles/override/ScrollIndicator.qml b/tests/auto/customization/data/styles/override/ScrollIndicator.qml index 32ca31fa..15a44e7a 100644 --- a/tests/auto/customization/data/styles/override/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/override/ScrollIndicator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ScrollIndicator { diff --git a/tests/auto/customization/data/styles/override/ScrollView.qml b/tests/auto/customization/data/styles/override/ScrollView.qml index 040c9815..a8041961 100644 --- a/tests/auto/customization/data/styles/override/ScrollView.qml +++ b/tests/auto/customization/data/styles/override/ScrollView.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ScrollView { diff --git a/tests/auto/customization/data/styles/override/Slider.qml b/tests/auto/customization/data/styles/override/Slider.qml index 0ca6f6c4..252752fd 100644 --- a/tests/auto/customization/data/styles/override/Slider.qml +++ b/tests/auto/customization/data/styles/override/Slider.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Slider { diff --git a/tests/auto/customization/data/styles/override/SpinBox.qml b/tests/auto/customization/data/styles/override/SpinBox.qml index ea7117cb..041ba6a0 100644 --- a/tests/auto/customization/data/styles/override/SpinBox.qml +++ b/tests/auto/customization/data/styles/override/SpinBox.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.SpinBox { diff --git a/tests/auto/customization/data/styles/override/StackView.qml b/tests/auto/customization/data/styles/override/StackView.qml index 2f109a43..aa35fd62 100644 --- a/tests/auto/customization/data/styles/override/StackView.qml +++ b/tests/auto/customization/data/styles/override/StackView.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.StackView { diff --git a/tests/auto/customization/data/styles/override/SwipeDelegate.qml b/tests/auto/customization/data/styles/override/SwipeDelegate.qml index 14267943..634f1e69 100644 --- a/tests/auto/customization/data/styles/override/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/override/SwipeDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.SwipeDelegate { diff --git a/tests/auto/customization/data/styles/override/SwipeView.qml b/tests/auto/customization/data/styles/override/SwipeView.qml index fa2cf56f..ffea0df8 100644 --- a/tests/auto/customization/data/styles/override/SwipeView.qml +++ b/tests/auto/customization/data/styles/override/SwipeView.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.SwipeView { diff --git a/tests/auto/customization/data/styles/override/Switch.qml b/tests/auto/customization/data/styles/override/Switch.qml index 4ab8ffe7..0006b00d 100644 --- a/tests/auto/customization/data/styles/override/Switch.qml +++ b/tests/auto/customization/data/styles/override/Switch.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Switch { diff --git a/tests/auto/customization/data/styles/override/SwitchDelegate.qml b/tests/auto/customization/data/styles/override/SwitchDelegate.qml index 25020d62..6a9e318c 100644 --- a/tests/auto/customization/data/styles/override/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/override/SwitchDelegate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.SwitchDelegate { diff --git a/tests/auto/customization/data/styles/override/TabBar.qml b/tests/auto/customization/data/styles/override/TabBar.qml index 7ea41c72..11c009e6 100644 --- a/tests/auto/customization/data/styles/override/TabBar.qml +++ b/tests/auto/customization/data/styles/override/TabBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.TabBar { diff --git a/tests/auto/customization/data/styles/override/TabButton.qml b/tests/auto/customization/data/styles/override/TabButton.qml index bdf3ff07..967e6ab5 100644 --- a/tests/auto/customization/data/styles/override/TabButton.qml +++ b/tests/auto/customization/data/styles/override/TabButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.TabButton { diff --git a/tests/auto/customization/data/styles/override/TextArea.qml b/tests/auto/customization/data/styles/override/TextArea.qml index 66a80882..5a1b1fe9 100644 --- a/tests/auto/customization/data/styles/override/TextArea.qml +++ b/tests/auto/customization/data/styles/override/TextArea.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.TextArea { diff --git a/tests/auto/customization/data/styles/override/TextField.qml b/tests/auto/customization/data/styles/override/TextField.qml index 4ef826be..2c37d9ae 100644 --- a/tests/auto/customization/data/styles/override/TextField.qml +++ b/tests/auto/customization/data/styles/override/TextField.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.TextField { diff --git a/tests/auto/customization/data/styles/override/ToolBar.qml b/tests/auto/customization/data/styles/override/ToolBar.qml index 8d201556..51346893 100644 --- a/tests/auto/customization/data/styles/override/ToolBar.qml +++ b/tests/auto/customization/data/styles/override/ToolBar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ToolBar { diff --git a/tests/auto/customization/data/styles/override/ToolButton.qml b/tests/auto/customization/data/styles/override/ToolButton.qml index 1f3adcdb..67bbcf64 100644 --- a/tests/auto/customization/data/styles/override/ToolButton.qml +++ b/tests/auto/customization/data/styles/override/ToolButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ToolButton { diff --git a/tests/auto/customization/data/styles/override/ToolSeparator.qml b/tests/auto/customization/data/styles/override/ToolSeparator.qml index 7a13a25d..70704e6b 100644 --- a/tests/auto/customization/data/styles/override/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/override/ToolSeparator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ToolSeparator { diff --git a/tests/auto/customization/data/styles/override/ToolTip.qml b/tests/auto/customization/data/styles/override/ToolTip.qml index 63f7ff6c..4be4dc43 100644 --- a/tests/auto/customization/data/styles/override/ToolTip.qml +++ b/tests/auto/customization/data/styles/override/ToolTip.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.ToolTip { diff --git a/tests/auto/customization/data/styles/override/Tumbler.qml b/tests/auto/customization/data/styles/override/Tumbler.qml index de4dd177..f3d56273 100644 --- a/tests/auto/customization/data/styles/override/Tumbler.qml +++ b/tests/auto/customization/data/styles/override/Tumbler.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import "../simple" as Simple Simple.Tumbler { diff --git a/tests/auto/customization/data/styles/simple/AbstractButton.qml b/tests/auto/customization/data/styles/simple/AbstractButton.qml index e1bcc362..2daaea48 100644 --- a/tests/auto/customization/data/styles/simple/AbstractButton.qml +++ b/tests/auto/customization/data/styles/simple/AbstractButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.AbstractButton { id: control diff --git a/tests/auto/customization/data/styles/simple/ApplicationWindow.qml b/tests/auto/customization/data/styles/simple/ApplicationWindow.qml index ff0ac2dd..6cf6440d 100644 --- a/tests/auto/customization/data/styles/simple/ApplicationWindow.qml +++ b/tests/auto/customization/data/styles/simple/ApplicationWindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ApplicationWindow { id: control diff --git a/tests/auto/customization/data/styles/simple/BusyIndicator.qml b/tests/auto/customization/data/styles/simple/BusyIndicator.qml index 5b63b5c1..f859a09b 100644 --- a/tests/auto/customization/data/styles/simple/BusyIndicator.qml +++ b/tests/auto/customization/data/styles/simple/BusyIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.BusyIndicator { id: control diff --git a/tests/auto/customization/data/styles/simple/Button.qml b/tests/auto/customization/data/styles/simple/Button.qml index d06ae6c1..66240ba2 100644 --- a/tests/auto/customization/data/styles/simple/Button.qml +++ b/tests/auto/customization/data/styles/simple/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Button { id: control diff --git a/tests/auto/customization/data/styles/simple/CheckBox.qml b/tests/auto/customization/data/styles/simple/CheckBox.qml index 00d76614..931228b0 100644 --- a/tests/auto/customization/data/styles/simple/CheckBox.qml +++ b/tests/auto/customization/data/styles/simple/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckBox { id: control diff --git a/tests/auto/customization/data/styles/simple/CheckDelegate.qml b/tests/auto/customization/data/styles/simple/CheckDelegate.qml index 08699bf8..cc1cdd7a 100644 --- a/tests/auto/customization/data/styles/simple/CheckDelegate.qml +++ b/tests/auto/customization/data/styles/simple/CheckDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.CheckDelegate { id: control diff --git a/tests/auto/customization/data/styles/simple/ComboBox.qml b/tests/auto/customization/data/styles/simple/ComboBox.qml index 42b95b61..658f5d77 100644 --- a/tests/auto/customization/data/styles/simple/ComboBox.qml +++ b/tests/auto/customization/data/styles/simple/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ComboBox { id: control diff --git a/tests/auto/customization/data/styles/simple/Container.qml b/tests/auto/customization/data/styles/simple/Container.qml index 59e51d6c..cfa32324 100644 --- a/tests/auto/customization/data/styles/simple/Container.qml +++ b/tests/auto/customization/data/styles/simple/Container.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Container { id: control diff --git a/tests/auto/customization/data/styles/simple/Control.qml b/tests/auto/customization/data/styles/simple/Control.qml index eb72f28a..d8ba3c81 100644 --- a/tests/auto/customization/data/styles/simple/Control.qml +++ b/tests/auto/customization/data/styles/simple/Control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Control { id: control diff --git a/tests/auto/customization/data/styles/simple/DelayButton.qml b/tests/auto/customization/data/styles/simple/DelayButton.qml index d9d071f2..d48abf9c 100644 --- a/tests/auto/customization/data/styles/simple/DelayButton.qml +++ b/tests/auto/customization/data/styles/simple/DelayButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DelayButton { id: control diff --git a/tests/auto/customization/data/styles/simple/Dial.qml b/tests/auto/customization/data/styles/simple/Dial.qml index bebe2979..26f1f86a 100644 --- a/tests/auto/customization/data/styles/simple/Dial.qml +++ b/tests/auto/customization/data/styles/simple/Dial.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dial { id: control diff --git a/tests/auto/customization/data/styles/simple/Dialog.qml b/tests/auto/customization/data/styles/simple/Dialog.qml index c30399eb..020ff66b 100644 --- a/tests/auto/customization/data/styles/simple/Dialog.qml +++ b/tests/auto/customization/data/styles/simple/Dialog.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Dialog { id: control diff --git a/tests/auto/customization/data/styles/simple/DialogButtonBox.qml b/tests/auto/customization/data/styles/simple/DialogButtonBox.qml index cbb5273d..6514647e 100644 --- a/tests/auto/customization/data/styles/simple/DialogButtonBox.qml +++ b/tests/auto/customization/data/styles/simple/DialogButtonBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.DialogButtonBox { id: control diff --git a/tests/auto/customization/data/styles/simple/Drawer.qml b/tests/auto/customization/data/styles/simple/Drawer.qml index 64028ba5..ac75cbdf 100644 --- a/tests/auto/customization/data/styles/simple/Drawer.qml +++ b/tests/auto/customization/data/styles/simple/Drawer.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Drawer { id: control diff --git a/tests/auto/customization/data/styles/simple/Frame.qml b/tests/auto/customization/data/styles/simple/Frame.qml index 5517f216..11a8e0fc 100644 --- a/tests/auto/customization/data/styles/simple/Frame.qml +++ b/tests/auto/customization/data/styles/simple/Frame.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Frame { id: control diff --git a/tests/auto/customization/data/styles/simple/GroupBox.qml b/tests/auto/customization/data/styles/simple/GroupBox.qml index d38670b5..309950ea 100644 --- a/tests/auto/customization/data/styles/simple/GroupBox.qml +++ b/tests/auto/customization/data/styles/simple/GroupBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.GroupBox { id: control diff --git a/tests/auto/customization/data/styles/simple/ItemDelegate.qml b/tests/auto/customization/data/styles/simple/ItemDelegate.qml index 7af444ed..9eb3c9c8 100644 --- a/tests/auto/customization/data/styles/simple/ItemDelegate.qml +++ b/tests/auto/customization/data/styles/simple/ItemDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ItemDelegate { id: control diff --git a/tests/auto/customization/data/styles/simple/Label.qml b/tests/auto/customization/data/styles/simple/Label.qml index 592d7f64..d7afddbb 100644 --- a/tests/auto/customization/data/styles/simple/Label.qml +++ b/tests/auto/customization/data/styles/simple/Label.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Label { id: control diff --git a/tests/auto/customization/data/styles/simple/Menu.qml b/tests/auto/customization/data/styles/simple/Menu.qml index 06163fcc..3c2d487c 100644 --- a/tests/auto/customization/data/styles/simple/Menu.qml +++ b/tests/auto/customization/data/styles/simple/Menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Menu { id: control diff --git a/tests/auto/customization/data/styles/simple/MenuBar.qml b/tests/auto/customization/data/styles/simple/MenuBar.qml index 6e38bde7..1e64a3ac 100644 --- a/tests/auto/customization/data/styles/simple/MenuBar.qml +++ b/tests/auto/customization/data/styles/simple/MenuBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBar { id: control diff --git a/tests/auto/customization/data/styles/simple/MenuBarItem.qml b/tests/auto/customization/data/styles/simple/MenuBarItem.qml index 5bb1e1f5..1454ceaa 100644 --- a/tests/auto/customization/data/styles/simple/MenuBarItem.qml +++ b/tests/auto/customization/data/styles/simple/MenuBarItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuBarItem { id: control diff --git a/tests/auto/customization/data/styles/simple/MenuItem.qml b/tests/auto/customization/data/styles/simple/MenuItem.qml index cb915170..59ac3471 100644 --- a/tests/auto/customization/data/styles/simple/MenuItem.qml +++ b/tests/auto/customization/data/styles/simple/MenuItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuItem { id: control diff --git a/tests/auto/customization/data/styles/simple/MenuSeparator.qml b/tests/auto/customization/data/styles/simple/MenuSeparator.qml index 6734ba84..413b412f 100644 --- a/tests/auto/customization/data/styles/simple/MenuSeparator.qml +++ b/tests/auto/customization/data/styles/simple/MenuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.MenuSeparator { id: control diff --git a/tests/auto/customization/data/styles/simple/Page.qml b/tests/auto/customization/data/styles/simple/Page.qml index 0d07d9ec..950bbdc0 100644 --- a/tests/auto/customization/data/styles/simple/Page.qml +++ b/tests/auto/customization/data/styles/simple/Page.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Page { id: control diff --git a/tests/auto/customization/data/styles/simple/PageIndicator.qml b/tests/auto/customization/data/styles/simple/PageIndicator.qml index 93eafdee..7ec5c57a 100644 --- a/tests/auto/customization/data/styles/simple/PageIndicator.qml +++ b/tests/auto/customization/data/styles/simple/PageIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.PageIndicator { id: control diff --git a/tests/auto/customization/data/styles/simple/Pane.qml b/tests/auto/customization/data/styles/simple/Pane.qml index 188e0edf..86fb079f 100644 --- a/tests/auto/customization/data/styles/simple/Pane.qml +++ b/tests/auto/customization/data/styles/simple/Pane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Pane { id: control diff --git a/tests/auto/customization/data/styles/simple/Popup.qml b/tests/auto/customization/data/styles/simple/Popup.qml index f605d3d6..41b90be0 100644 --- a/tests/auto/customization/data/styles/simple/Popup.qml +++ b/tests/auto/customization/data/styles/simple/Popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Popup { id: control diff --git a/tests/auto/customization/data/styles/simple/ProgressBar.qml b/tests/auto/customization/data/styles/simple/ProgressBar.qml index eebd3eb9..81c0f146 100644 --- a/tests/auto/customization/data/styles/simple/ProgressBar.qml +++ b/tests/auto/customization/data/styles/simple/ProgressBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ProgressBar { id: control diff --git a/tests/auto/customization/data/styles/simple/RadioButton.qml b/tests/auto/customization/data/styles/simple/RadioButton.qml index 8f07acc5..c9910756 100644 --- a/tests/auto/customization/data/styles/simple/RadioButton.qml +++ b/tests/auto/customization/data/styles/simple/RadioButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioButton { id: control diff --git a/tests/auto/customization/data/styles/simple/RadioDelegate.qml b/tests/auto/customization/data/styles/simple/RadioDelegate.qml index 734b7a20..c59fa336 100644 --- a/tests/auto/customization/data/styles/simple/RadioDelegate.qml +++ b/tests/auto/customization/data/styles/simple/RadioDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RadioDelegate { id: control diff --git a/tests/auto/customization/data/styles/simple/RangeSlider.qml b/tests/auto/customization/data/styles/simple/RangeSlider.qml index 3e46bb58..d16c4bcf 100644 --- a/tests/auto/customization/data/styles/simple/RangeSlider.qml +++ b/tests/auto/customization/data/styles/simple/RangeSlider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RangeSlider { id: control diff --git a/tests/auto/customization/data/styles/simple/RoundButton.qml b/tests/auto/customization/data/styles/simple/RoundButton.qml index aa26e24b..c5609e34 100644 --- a/tests/auto/customization/data/styles/simple/RoundButton.qml +++ b/tests/auto/customization/data/styles/simple/RoundButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.RoundButton { id: control diff --git a/tests/auto/customization/data/styles/simple/ScrollBar.qml b/tests/auto/customization/data/styles/simple/ScrollBar.qml index faa0e510..01f3f78e 100644 --- a/tests/auto/customization/data/styles/simple/ScrollBar.qml +++ b/tests/auto/customization/data/styles/simple/ScrollBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollBar { id: control diff --git a/tests/auto/customization/data/styles/simple/ScrollIndicator.qml b/tests/auto/customization/data/styles/simple/ScrollIndicator.qml index 9843021c..4b802ed7 100644 --- a/tests/auto/customization/data/styles/simple/ScrollIndicator.qml +++ b/tests/auto/customization/data/styles/simple/ScrollIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollIndicator { id: control diff --git a/tests/auto/customization/data/styles/simple/ScrollView.qml b/tests/auto/customization/data/styles/simple/ScrollView.qml index 1aabc897..fe782285 100644 --- a/tests/auto/customization/data/styles/simple/ScrollView.qml +++ b/tests/auto/customization/data/styles/simple/ScrollView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ScrollView { id: control diff --git a/tests/auto/customization/data/styles/simple/Slider.qml b/tests/auto/customization/data/styles/simple/Slider.qml index ba81a518..109709b2 100644 --- a/tests/auto/customization/data/styles/simple/Slider.qml +++ b/tests/auto/customization/data/styles/simple/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Slider { id: control diff --git a/tests/auto/customization/data/styles/simple/SpinBox.qml b/tests/auto/customization/data/styles/simple/SpinBox.qml index bf27c5c0..9db98875 100644 --- a/tests/auto/customization/data/styles/simple/SpinBox.qml +++ b/tests/auto/customization/data/styles/simple/SpinBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SpinBox { id: control diff --git a/tests/auto/customization/data/styles/simple/StackView.qml b/tests/auto/customization/data/styles/simple/StackView.qml index d0ad0529..f1439275 100644 --- a/tests/auto/customization/data/styles/simple/StackView.qml +++ b/tests/auto/customization/data/styles/simple/StackView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.StackView { id: control diff --git a/tests/auto/customization/data/styles/simple/SwipeDelegate.qml b/tests/auto/customization/data/styles/simple/SwipeDelegate.qml index 365858db..27701a92 100644 --- a/tests/auto/customization/data/styles/simple/SwipeDelegate.qml +++ b/tests/auto/customization/data/styles/simple/SwipeDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeDelegate { id: control diff --git a/tests/auto/customization/data/styles/simple/SwipeView.qml b/tests/auto/customization/data/styles/simple/SwipeView.qml index c9a4447e..abdde942 100644 --- a/tests/auto/customization/data/styles/simple/SwipeView.qml +++ b/tests/auto/customization/data/styles/simple/SwipeView.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwipeView { id: control diff --git a/tests/auto/customization/data/styles/simple/Switch.qml b/tests/auto/customization/data/styles/simple/Switch.qml index 2f3a4a88..8d008ffb 100644 --- a/tests/auto/customization/data/styles/simple/Switch.qml +++ b/tests/auto/customization/data/styles/simple/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Switch { id: control diff --git a/tests/auto/customization/data/styles/simple/SwitchDelegate.qml b/tests/auto/customization/data/styles/simple/SwitchDelegate.qml index 85a27323..cdc91314 100644 --- a/tests/auto/customization/data/styles/simple/SwitchDelegate.qml +++ b/tests/auto/customization/data/styles/simple/SwitchDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.SwitchDelegate { id: control diff --git a/tests/auto/customization/data/styles/simple/TabBar.qml b/tests/auto/customization/data/styles/simple/TabBar.qml index b3080f3f..5055346e 100644 --- a/tests/auto/customization/data/styles/simple/TabBar.qml +++ b/tests/auto/customization/data/styles/simple/TabBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabBar { id: control diff --git a/tests/auto/customization/data/styles/simple/TabButton.qml b/tests/auto/customization/data/styles/simple/TabButton.qml index 7dccf5b8..d6b67647 100644 --- a/tests/auto/customization/data/styles/simple/TabButton.qml +++ b/tests/auto/customization/data/styles/simple/TabButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TabButton { id: control diff --git a/tests/auto/customization/data/styles/simple/TextArea.qml b/tests/auto/customization/data/styles/simple/TextArea.qml index c28b7a62..10c326a6 100644 --- a/tests/auto/customization/data/styles/simple/TextArea.qml +++ b/tests/auto/customization/data/styles/simple/TextArea.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextArea { id: control diff --git a/tests/auto/customization/data/styles/simple/TextField.qml b/tests/auto/customization/data/styles/simple/TextField.qml index 827506ec..09c12a60 100644 --- a/tests/auto/customization/data/styles/simple/TextField.qml +++ b/tests/auto/customization/data/styles/simple/TextField.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.TextField { id: control diff --git a/tests/auto/customization/data/styles/simple/ToolBar.qml b/tests/auto/customization/data/styles/simple/ToolBar.qml index b8c07927..9b23b67c 100644 --- a/tests/auto/customization/data/styles/simple/ToolBar.qml +++ b/tests/auto/customization/data/styles/simple/ToolBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolBar { id: control diff --git a/tests/auto/customization/data/styles/simple/ToolButton.qml b/tests/auto/customization/data/styles/simple/ToolButton.qml index e6af792d..13ccb576 100644 --- a/tests/auto/customization/data/styles/simple/ToolButton.qml +++ b/tests/auto/customization/data/styles/simple/ToolButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolButton { id: control diff --git a/tests/auto/customization/data/styles/simple/ToolSeparator.qml b/tests/auto/customization/data/styles/simple/ToolSeparator.qml index 8e9ff373..ef172f74 100644 --- a/tests/auto/customization/data/styles/simple/ToolSeparator.qml +++ b/tests/auto/customization/data/styles/simple/ToolSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolSeparator { id: control diff --git a/tests/auto/customization/data/styles/simple/ToolTip.qml b/tests/auto/customization/data/styles/simple/ToolTip.qml index 1df40746..27a61c17 100644 --- a/tests/auto/customization/data/styles/simple/ToolTip.qml +++ b/tests/auto/customization/data/styles/simple/ToolTip.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.ToolTip { id: control diff --git a/tests/auto/customization/data/styles/simple/Tumbler.qml b/tests/auto/customization/data/styles/simple/Tumbler.qml index 79686990..58c85541 100644 --- a/tests/auto/customization/data/styles/simple/Tumbler.qml +++ b/tests/auto/customization/data/styles/simple/Tumbler.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Templates 2.2 as T +import QtQuick 2.12 +import QtQuick.Templates 2.12 as T T.Tumbler { id: control diff --git a/tests/auto/designer/designer.pro b/tests/auto/designer/designer.pro new file mode 100644 index 00000000..68fbc747 --- /dev/null +++ b/tests/auto/designer/designer.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = tst_designer + +QT += quick quick-private quickcontrols2 testlib +CONFIG += testcase +macos:CONFIG -= app_bundle + +SOURCES += \ + $$PWD/tst_designer.cpp diff --git a/tests/auto/designer/tst_designer.cpp b/tests/auto/designer/tst_designer.cpp new file mode 100644 index 00000000..2c67c2c6 --- /dev/null +++ b/tests/auto/designer/tst_designer.cpp @@ -0,0 +1,161 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest> +#include <QtQuick> + +#include <QtQuickControls2> +#include <QQmlComponent> +#include <QDir> + +#include <private/qquickdesignersupportitems_p.h> + +class tst_Designer : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + + void test_controls(); + void test_controls_data(); +}; + + +void tst_Designer::initTestCase() +{ +} + +void doComponentCompleteRecursive(QObject *object) +{ + if (object) { + QQuickItem *item = qobject_cast<QQuickItem*>(object); + + if (item && DesignerSupport::isComponentComplete(item)) + return; + + DesignerSupport::emitComponentCompleteSignalForAttachedProperty(qobject_cast<QQuickItem*>(object)); + + QList<QObject*> childList = object->children(); + + if (item) { + for (QQuickItem *childItem : item->childItems()) { + if (!childList.contains(childItem)) + childList.append(childItem); + } + } + + for (QObject *child : childList) + doComponentCompleteRecursive(child); + + if (item) { + static_cast<QQmlParserStatus*>(item)->componentComplete(); + } else { + QQmlParserStatus *qmlParserStatus = dynamic_cast< QQmlParserStatus*>(object); + if (qmlParserStatus) + qmlParserStatus->componentComplete(); + } + } +} + + +void tst_Designer::test_controls() +{ + QFETCH(QString, type); + + const QByteArray before("import QtQuick 2.10\n" + "import QtQuick.Controls 2.3\n" + "Item {\n"); + + QByteArray source = before; + source.append(type); + + const QByteArray after(" {" + "}\n" + "}\n"); + + source.append(after); + + QQmlEngine engine; + QQmlComponent component(&engine); + + { + ComponentCompleteDisabler disableComponentComplete; + component.setData(source, QUrl::fromLocalFile(QDir::current().absolutePath())); + } + + QObject *root = component.create(); + QVERIFY(root); + doComponentCompleteRecursive(root); +} + +void tst_Designer::test_controls_data() +{ + QTest::addColumn<QString>("type"); + + QTest::newRow("type") << "SpinBox"; + QTest::newRow("type") << "Switch"; + QTest::newRow("type") << "ComboBox"; + QTest::newRow("type") << "CheckBox"; + QTest::newRow("type") << "Button"; + QTest::newRow("type") << "DelayButton"; + QTest::newRow("type") << "Dial"; + QTest::newRow("type") << "Frame"; + QTest::newRow("type") << "GroupBox"; + QTest::newRow("type") << "Label"; + QTest::newRow("type") << "Page"; + QTest::newRow("type") << "Pane"; + QTest::newRow("type") << "ProgressBar"; + QTest::newRow("type") << "RadioButton"; + QTest::newRow("type") << "RangeSlider"; + QTest::newRow("type") << "RoundButton"; + QTest::newRow("type") << "ScrollView"; + QTest::newRow("type") << "Slider"; + QTest::newRow("type") << "StackView"; + QTest::newRow("type") << "SwipeView"; + QTest::newRow("type") << "Switch"; + QTest::newRow("type") << "TabBar"; + QTest::newRow("type") << "TabButton"; + QTest::newRow("type") << "TextArea"; + QTest::newRow("type") << "TextField"; + QTest::newRow("type") << "ToolBar"; + QTest::newRow("type") << "ToolButton"; + QTest::newRow("type") << "Tumbler"; +} + +QTEST_MAIN(tst_Designer) + +#include "tst_designer.moc" diff --git a/tests/auto/focus/data/activeFocusOnTab.qml b/tests/auto/focus/data/activeFocusOnTab.qml index fac5a5d5..21bea5e8 100644 --- a/tests/auto/focus/data/activeFocusOnTab.qml +++ b/tests/auto/focus/data/activeFocusOnTab.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: main diff --git a/tests/auto/focus/data/keyNavigation.qml b/tests/auto/focus/data/keyNavigation.qml index ba7d5807..6e949d1d 100644 --- a/tests/auto/focus/data/keyNavigation.qml +++ b/tests/auto/focus/data/keyNavigation.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: main diff --git a/tests/auto/focus/data/visualFocus.qml b/tests/auto/focus/data/visualFocus.qml index 08b44203..3f3e8fb6 100644 --- a/tests/auto/focus/data/visualFocus.qml +++ b/tests/auto/focus/data/visualFocus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Column { width: 400 diff --git a/tests/auto/font/data/font-appwindow-custom.qml b/tests/auto/font/data/font-appwindow-custom.qml index e98b678e..20101bfa 100644 --- a/tests/auto/font/data/font-appwindow-custom.qml +++ b/tests/auto/font/data/font-appwindow-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { font.capitalization: Font.AllUppercase diff --git a/tests/auto/font/data/font-appwindow-default.qml b/tests/auto/font/data/font-appwindow-default.qml index 8337b488..bc75cbb2 100644 --- a/tests/auto/font/data/font-appwindow-default.qml +++ b/tests/auto/font/data/font-appwindow-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { } diff --git a/tests/auto/font/data/font-control-custom.qml b/tests/auto/font/data/font-control-custom.qml index 0121eca2..3f198746 100644 --- a/tests/auto/font/data/font-control-custom.qml +++ b/tests/auto/font/data/font-control-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { font.capitalization: Font.AllUppercase diff --git a/tests/auto/font/data/font-control-default.qml b/tests/auto/font/data/font-control-default.qml index f3af36a2..e7e78036 100644 --- a/tests/auto/font/data/font-control-default.qml +++ b/tests/auto/font/data/font-control-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/font/data/font-popup-custom.qml b/tests/auto/font/data/font-popup-custom.qml index 3982721e..3d9eb4a2 100644 --- a/tests/auto/font/data/font-popup-custom.qml +++ b/tests/auto/font/data/font-popup-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { font.capitalization: Font.AllUppercase diff --git a/tests/auto/font/data/font-popup-default.qml b/tests/auto/font/data/font-popup-default.qml index c4fab76a..a9bde413 100644 --- a/tests/auto/font/data/font-popup-default.qml +++ b/tests/auto/font/data/font-popup-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { } diff --git a/tests/auto/font/data/inheritance-childcontrol.qml b/tests/auto/font/data/inheritance-childcontrol.qml index 7c2b0d0c..4ddab64c 100644 --- a/tests/auto/font/data/inheritance-childcontrol.qml +++ b/tests/auto/font/data/inheritance-childcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-childpopup.qml b/tests/auto/font/data/inheritance-childpopup.qml index 304f0486..6868949b 100644 --- a/tests/auto/font/data/inheritance-childpopup.qml +++ b/tests/auto/font/data/inheritance-childpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-control.qml b/tests/auto/font/data/inheritance-control.qml index fe555237..68f7371c 100644 --- a/tests/auto/font/data/inheritance-control.qml +++ b/tests/auto/font/data/inheritance-control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml index 982b5611..1f7c56d1 100644 --- a/tests/auto/font/data/inheritance-dynamicchildcontrol.qml +++ b/tests/auto/font/data/inheritance-dynamicchildcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicchildpopup.qml b/tests/auto/font/data/inheritance-dynamicchildpopup.qml index 7af10af6..a32d34ec 100644 --- a/tests/auto/font/data/inheritance-dynamicchildpopup.qml +++ b/tests/auto/font/data/inheritance-dynamicchildpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamiccontrol.qml b/tests/auto/font/data/inheritance-dynamiccontrol.qml index 263ad38d..d200e397 100644 --- a/tests/auto/font/data/inheritance-dynamiccontrol.qml +++ b/tests/auto/font/data/inheritance-dynamiccontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-dynamicpopup.qml b/tests/auto/font/data/inheritance-dynamicpopup.qml index cd355682..a084cc1b 100644 --- a/tests/auto/font/data/inheritance-dynamicpopup.qml +++ b/tests/auto/font/data/inheritance-dynamicpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/inheritance-popup.qml b/tests/auto/font/data/inheritance-popup.qml index 3219a186..e114287f 100644 --- a/tests/auto/font/data/inheritance-popup.qml +++ b/tests/auto/font/data/inheritance-popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/font/data/listview.qml b/tests/auto/font/data/listview.qml index dcd38751..048567e5 100644 --- a/tests/auto/font/data/listview.qml +++ b/tests/auto/font/data/listview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-childcontrol.qml b/tests/auto/palette/data/inheritance-childcontrol.qml index 7c2b0d0c..4ddab64c 100644 --- a/tests/auto/palette/data/inheritance-childcontrol.qml +++ b/tests/auto/palette/data/inheritance-childcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-childpopup.qml b/tests/auto/palette/data/inheritance-childpopup.qml index 304f0486..6868949b 100644 --- a/tests/auto/palette/data/inheritance-childpopup.qml +++ b/tests/auto/palette/data/inheritance-childpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-control.qml b/tests/auto/palette/data/inheritance-control.qml index e5486edb..68f7371c 100644 --- a/tests/auto/palette/data/inheritance-control.qml +++ b/tests/auto/palette/data/inheritance-control.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml index 982b5611..1f7c56d1 100644 --- a/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml +++ b/tests/auto/palette/data/inheritance-dynamicchildcontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml index 7af10af6..a32d34ec 100644 --- a/tests/auto/palette/data/inheritance-dynamicchildpopup.qml +++ b/tests/auto/palette/data/inheritance-dynamicchildpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamiccontrol.qml b/tests/auto/palette/data/inheritance-dynamiccontrol.qml index 263ad38d..d200e397 100644 --- a/tests/auto/palette/data/inheritance-dynamiccontrol.qml +++ b/tests/auto/palette/data/inheritance-dynamiccontrol.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-dynamicpopup.qml b/tests/auto/palette/data/inheritance-dynamicpopup.qml index cd355682..a084cc1b 100644 --- a/tests/auto/palette/data/inheritance-dynamicpopup.qml +++ b/tests/auto/palette/data/inheritance-dynamicpopup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/inheritance-popup.qml b/tests/auto/palette/data/inheritance-popup.qml index e6ac0a3a..e114287f 100644 --- a/tests/auto/palette/data/inheritance-popup.qml +++ b/tests/auto/palette/data/inheritance-popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/listview.qml b/tests/auto/palette/data/listview.qml index 7381c310..a19f6d26 100644 --- a/tests/auto/palette/data/listview.qml +++ b/tests/auto/palette/data/listview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/palette/data/palette-appwindow-custom.qml b/tests/auto/palette/data/palette-appwindow-custom.qml index 33139e48..a59fb42c 100644 --- a/tests/auto/palette/data/palette-appwindow-custom.qml +++ b/tests/auto/palette/data/palette-appwindow-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { palette.alternateBase: "aqua" diff --git a/tests/auto/palette/data/palette-appwindow-default.qml b/tests/auto/palette/data/palette-appwindow-default.qml index c071a0f4..bc75cbb2 100644 --- a/tests/auto/palette/data/palette-appwindow-default.qml +++ b/tests/auto/palette/data/palette-appwindow-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { } diff --git a/tests/auto/palette/data/palette-control-custom.qml b/tests/auto/palette/data/palette-control-custom.qml index d3eb05bd..fb4b9282 100644 --- a/tests/auto/palette/data/palette-control-custom.qml +++ b/tests/auto/palette/data/palette-control-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { palette.alternateBase: "aqua" diff --git a/tests/auto/palette/data/palette-control-default.qml b/tests/auto/palette/data/palette-control-default.qml index b747d7e2..e7e78036 100644 --- a/tests/auto/palette/data/palette-control-default.qml +++ b/tests/auto/palette/data/palette-control-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/palette/data/palette-popup-custom.qml b/tests/auto/palette/data/palette-popup-custom.qml index 3b7cec3d..ffecfea2 100644 --- a/tests/auto/palette/data/palette-popup-custom.qml +++ b/tests/auto/palette/data/palette-popup-custom.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { palette.alternateBase: "aqua" diff --git a/tests/auto/palette/data/palette-popup-default.qml b/tests/auto/palette/data/palette-popup-default.qml index f09feae0..a9bde413 100644 --- a/tests/auto/palette/data/palette-popup-default.qml +++ b/tests/auto/palette/data/palette-popup-default.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Popup { } diff --git a/tests/auto/platform/data/tst_colordialog.qml b/tests/auto/platform/data/tst_colordialog.qml index 224692f0..98122c25 100644 --- a/tests/auto/platform/data/tst_colordialog.qml +++ b/tests/auto/platform/data/tst_colordialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_filedialog.qml b/tests/auto/platform/data/tst_filedialog.qml index 8edb0ec4..775e24d3 100644 --- a/tests/auto/platform/data/tst_filedialog.qml +++ b/tests/auto/platform/data/tst_filedialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_folderdialog.qml b/tests/auto/platform/data/tst_folderdialog.qml index 9aed6e67..5f44b995 100644 --- a/tests/auto/platform/data/tst_folderdialog.qml +++ b/tests/auto/platform/data/tst_folderdialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_fontdialog.qml b/tests/auto/platform/data/tst_fontdialog.qml index 493af4f0..8166964f 100644 --- a/tests/auto/platform/data/tst_fontdialog.qml +++ b/tests/auto/platform/data/tst_fontdialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/platform/data/tst_menu.qml index 06b9a30f..bb37c17b 100644 --- a/tests/auto/platform/data/tst_menu.qml +++ b/tests/auto/platform/data/tst_menu.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menubar.qml b/tests/auto/platform/data/tst_menubar.qml index 662d6ff7..199c5010 100644 --- a/tests/auto/platform/data/tst_menubar.qml +++ b/tests/auto/platform/data/tst_menubar.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/platform/data/tst_menuitem.qml index 17097073..63d4989a 100644 --- a/tests/auto/platform/data/tst_menuitem.qml +++ b/tests/auto/platform/data/tst_menuitem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menuitemgroup.qml b/tests/auto/platform/data/tst_menuitemgroup.qml index cc9da352..c65150ca 100644 --- a/tests/auto/platform/data/tst_menuitemgroup.qml +++ b/tests/auto/platform/data/tst_menuitemgroup.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_menuseparator.qml b/tests/auto/platform/data/tst_menuseparator.qml index fb7688e3..29c48f6b 100644 --- a/tests/auto/platform/data/tst_menuseparator.qml +++ b/tests/auto/platform/data/tst_menuseparator.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/platform/data/tst_messagedialog.qml index cf51c27d..d5f2e21f 100644 --- a/tests/auto/platform/data/tst_messagedialog.qml +++ b/tests/auto/platform/data/tst_messagedialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_standardpaths.qml b/tests/auto/platform/data/tst_standardpaths.qml index 3f7d51d1..35f0d23b 100644 --- a/tests/auto/platform/data/tst_standardpaths.qml +++ b/tests/auto/platform/data/tst_standardpaths.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml index ea6f731a..675f08f3 100644 --- a/tests/auto/platform/data/tst_systemtrayicon.qml +++ b/tests/auto/platform/data/tst_systemtrayicon.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.platform 1.0 diff --git a/tests/auto/pressandhold/data/dependencies.qml b/tests/auto/pressandhold/data/dependencies.qml index cd3e88ba..dac5f935 100644 --- a/tests/auto/pressandhold/data/dependencies.qml +++ b/tests/auto/pressandhold/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml index 940e8e08..743ae16d 100644 --- a/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml +++ b/tests/auto/qquickapplicationwindow/data/activeFocusControl.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml index 357ea9a4..45b3d1e3 100644 --- a/tests/auto/qquickapplicationwindow/data/activefocusontab.qml +++ b/tests/auto/qquickapplicationwindow/data/activefocusontab.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml index 09bc47ef..53a139c1 100644 --- a/tests/auto/qquickapplicationwindow/data/attachedProperties.qml +++ b/tests/auto/qquickapplicationwindow/data/attachedProperties.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 ApplicationWindow { property alias childControl: childControl diff --git a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml index 16182f59..a9412fd6 100644 --- a/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/qquickapplicationwindow/data/basicapplicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml index a992e0be..d3218998 100644 --- a/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml +++ b/tests/auto/qquickapplicationwindow/data/clearfocusondestruction.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 +import QtGraphicalEffects 1.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml index 741ce908..5dff2b6c 100644 --- a/tests/auto/qquickapplicationwindow/data/defaultFocus.qml +++ b/tests/auto/qquickapplicationwindow/data/defaultFocus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { visible: true diff --git a/tests/auto/qquickapplicationwindow/data/fill.qml b/tests/auto/qquickapplicationwindow/data/fill.qml index 27b10d34..d29ed0f9 100644 --- a/tests/auto/qquickapplicationwindow/data/fill.qml +++ b/tests/auto/qquickapplicationwindow/data/fill.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml index f0499a3a..313bbb5f 100644 --- a/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml +++ b/tests/auto/qquickapplicationwindow/data/focusAfterPopupClosed.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/font.qml b/tests/auto/qquickapplicationwindow/data/font.qml index a675aeab..8bde4bf1 100644 --- a/tests/auto/qquickapplicationwindow/data/font.qml +++ b/tests/auto/qquickapplicationwindow/data/font.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/qquickapplicationwindow/data/layout.qml b/tests/auto/qquickapplicationwindow/data/layout.qml index 5bcffdf1..dc840443 100644 --- a/tests/auto/qquickapplicationwindow/data/layout.qml +++ b/tests/auto/qquickapplicationwindow/data/layout.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickapplicationwindow/data/locale.qml b/tests/auto/qquickapplicationwindow/data/locale.qml index 92edb53a..5efb948f 100644 --- a/tests/auto/qquickapplicationwindow/data/locale.qml +++ b/tests/auto/qquickapplicationwindow/data/locale.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Templates 2.1 as T +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/qquickcolor/data/tst_color.qml b/tests/auto/qquickcolor/data/tst_color.qml index fbd74e3c..e3083514 100644 --- a/tests/auto/qquickcolor/data/tst_color.qml +++ b/tests/auto/qquickcolor/data/tst_color.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickdrawer/data/applicationwindow-button.qml b/tests/auto/qquickdrawer/data/applicationwindow-button.qml index 9641351e..8e1047b5 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-button.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml index 560efec3..3de06805 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-hover.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-hover.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml index 541f08aa..5042f44f 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow-wheel.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/applicationwindow.qml b/tests/auto/qquickdrawer/data/applicationwindow.qml index 673c4d4c..01b8ff77 100644 --- a/tests/auto/qquickdrawer/data/applicationwindow.qml +++ b/tests/auto/qquickdrawer/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml index 66eb2f4b..7354b6b9 100644 --- a/tests/auto/qquickdrawer/data/dragOverModalShadow.qml +++ b/tests/auto/qquickdrawer/data/dragOverModalShadow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/flickable.qml b/tests/auto/qquickdrawer/data/flickable.qml index 62256afd..4afef66b 100644 --- a/tests/auto/qquickdrawer/data/flickable.qml +++ b/tests/auto/qquickdrawer/data/flickable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/grabber.qml b/tests/auto/qquickdrawer/data/grabber.qml index e6ebe2da..1f9bbcbb 100644 --- a/tests/auto/qquickdrawer/data/grabber.qml +++ b/tests/auto/qquickdrawer/data/grabber.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/header.qml b/tests/auto/qquickdrawer/data/header.qml index de3af106..af84cf9b 100644 --- a/tests/auto/qquickdrawer/data/header.qml +++ b/tests/auto/qquickdrawer/data/header.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/multiTouch.qml b/tests/auto/qquickdrawer/data/multiTouch.qml index 0faf3c61..57135e5f 100644 --- a/tests/auto/qquickdrawer/data/multiTouch.qml +++ b/tests/auto/qquickdrawer/data/multiTouch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/multiple.qml b/tests/auto/qquickdrawer/data/multiple.qml index 4e622fca..d629e3d0 100644 --- a/tests/auto/qquickdrawer/data/multiple.qml +++ b/tests/auto/qquickdrawer/data/multiple.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/reposition.qml b/tests/auto/qquickdrawer/data/reposition.qml index 485da85c..841e0b77 100644 --- a/tests/auto/qquickdrawer/data/reposition.qml +++ b/tests/auto/qquickdrawer/data/reposition.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickdrawer/data/slider.qml b/tests/auto/qquickdrawer/data/slider.qml index 595e7091..391a79f0 100644 --- a/tests/auto/qquickdrawer/data/slider.qml +++ b/tests/auto/qquickdrawer/data/slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-button.qml b/tests/auto/qquickdrawer/data/window-button.qml index 1b8ac7d5..975d50db 100644 --- a/tests/auto/qquickdrawer/data/window-button.qml +++ b/tests/auto/qquickdrawer/data/window-button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-hover.qml b/tests/auto/qquickdrawer/data/window-hover.qml index b35bcd99..8360d7ce 100644 --- a/tests/auto/qquickdrawer/data/window-hover.qml +++ b/tests/auto/qquickdrawer/data/window-hover.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickdrawer/data/window-wheel.qml b/tests/auto/qquickdrawer/data/window-wheel.qml index 988a541e..f313f368 100644 --- a/tests/auto/qquickdrawer/data/window-wheel.qml +++ b/tests/auto/qquickdrawer/data/window-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { id: window diff --git a/tests/auto/qquickdrawer/data/window.qml b/tests/auto/qquickdrawer/data/window.qml index 88376ac4..578d3e9f 100644 --- a/tests/auto/qquickdrawer/data/window.qml +++ b/tests/auto/qquickdrawer/data/window.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickiconimage/data/alignment.qml b/tests/auto/qquickiconimage/data/alignment.qml index 487ebfd0..4e5ac6e7 100644 --- a/tests/auto/qquickiconimage/data/alignment.qml +++ b/tests/auto/qquickiconimage/data/alignment.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/color.qml b/tests/auto/qquickiconimage/data/color.qml index d6f647e6..b5d40d70 100644 --- a/tests/auto/qquickiconimage/data/color.qml +++ b/tests/auto/qquickiconimage/data/color.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/fileSelectors.qml b/tests/auto/qquickiconimage/data/fileSelectors.qml index 487ebfd0..4e5ac6e7 100644 --- a/tests/auto/qquickiconimage/data/fileSelectors.qml +++ b/tests/auto/qquickiconimage/data/fileSelectors.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/imageProvider.qml b/tests/auto/qquickiconimage/data/imageProvider.qml index 0d7d3033..cf03ac7e 100644 --- a/tests/auto/qquickiconimage/data/imageProvider.qml +++ b/tests/auto/qquickiconimage/data/imageProvider.qml @@ -1,7 +1,7 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 -import QtQuick.Templates 2.3 as T +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Templates 2.12 as T IconLabel { icon.color: "transparent" diff --git a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml index d6c33bb3..d0ea13c2 100644 --- a/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/nameBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml index 487ebfd0..4e5ac6e7 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml index c503d8cf..db6697d0 100644 --- a/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/nameBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 IconImage { name: "appointment-new" diff --git a/tests/auto/qquickiconimage/data/root.qml b/tests/auto/qquickiconimage/data/root.qml index 0a8b8db9..31ad7265 100644 --- a/tests/auto/qquickiconimage/data/root.qml +++ b/tests/auto/qquickiconimage/data/root.qml @@ -1,4 +1,4 @@ -import QtQuick 2.10 +import QtQuick 2.12 Item { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml index 33f4a2d3..08dcd55e 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml index c246dc74..24678f8c 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml index ecbb7f6d..9ac26e22 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceSizeWidthHeight.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 IconImage { source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" diff --git a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml index f9e07899..655add7b 100644 --- a/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml +++ b/tests/auto/qquickiconimage/data/sourceBindingSourceTooLarge.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 IconImage { source: "qrc:/icons/testtheme/22x22/actions/appointment-new.png" diff --git a/tests/auto/qquickiconimage/data/svgNoSizes.qml b/tests/auto/qquickiconimage/data/svgNoSizes.qml index 17cccd26..d2652827 100644 --- a/tests/auto/qquickiconimage/data/svgNoSizes.qml +++ b/tests/auto/qquickiconimage/data/svgNoSizes.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml index 2387e98e..c9157700 100644 --- a/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml +++ b/tests/auto/qquickiconimage/data/svgSourceBindingSourceSize.qml @@ -1,6 +1,6 @@ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Row { width: 200 diff --git a/tests/auto/qquickiconimage/data/translucentColors.qml b/tests/auto/qquickiconimage/data/translucentColors.qml index 49178d76..fd208235 100644 --- a/tests/auto/qquickiconimage/data/translucentColors.qml +++ b/tests/auto/qquickiconimage/data/translucentColors.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 ApplicationWindow { width: 500 diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml index 6fc579f8..954c1ef4 100644 --- a/tests/auto/qquickiconlabel/data/colorChanges.qml +++ b/tests/auto/qquickiconlabel/data/colorChanges.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml index 97042107..b82f9faf 100644 --- a/tests/auto/qquickiconlabel/data/iconlabel.qml +++ b/tests/auto/qquickiconlabel/data/iconlabel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml index ccdb74e2..61c9f74c 100644 --- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml +++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 AbstractButton { id: button diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml index 9015aa9d..7c2ecb0f 100644 --- a/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml +++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 Item { width: 200 diff --git a/tests/auto/qquickimaginestyle/data/tst_imagine.qml b/tests/auto/qquickimaginestyle/data/tst_imagine.qml index 72df8814..03bb9602 100644 --- a/tests/auto/qquickimaginestyle/data/tst_imagine.qml +++ b/tests/auto/qquickimaginestyle/data/tst_imagine.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.9 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.1 -import QtQuick.Templates 2.3 as T -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml index 38c177ee..9f2456b8 100644 --- a/tests/auto/qquickmaterialstyle/data/tst_material.qml +++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml @@ -48,12 +48,12 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Templates 2.1 as T -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml index 9a31966f..8e3be027 100644 --- a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/actions.qml b/tests/auto/qquickmenu/data/actions.qml index 0ec9f36c..6998c722 100644 --- a/tests/auto/qquickmenu/data/actions.qml +++ b/tests/auto/qquickmenu/data/actions.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml index 0668e439..ae592432 100644 --- a/tests/auto/qquickmenu/data/addItem.qml +++ b/tests/auto/qquickmenu/data/addItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml index 1814356c..b9894aed 100644 --- a/tests/auto/qquickmenu/data/applicationWindowScrollable.qml +++ b/tests/auto/qquickmenu/data/applicationWindowScrollable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml index 265a2f1a..986853e4 100644 --- a/tests/auto/qquickmenu/data/applicationwindow.qml +++ b/tests/auto/qquickmenu/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml index 48176d37..303e9155 100644 --- a/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml +++ b/tests/auto/qquickmenu/data/delegateFromSeparateComponent.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 800 diff --git a/tests/auto/qquickmenu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml index 6cdf8b27..ce6bd307 100644 --- a/tests/auto/qquickmenu/data/menuSeparator.qml +++ b/tests/auto/qquickmenu/data/menuSeparator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/mnemonics.qml b/tests/auto/qquickmenu/data/mnemonics.qml index de4cd215..510d2401 100644 --- a/tests/auto/qquickmenu/data/mnemonics.qml +++ b/tests/auto/qquickmenu/data/mnemonics.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/order.qml b/tests/auto/qquickmenu/data/order.qml index db5c3c1a..e03c86d3 100644 --- a/tests/auto/qquickmenu/data/order.qml +++ b/tests/auto/qquickmenu/data/order.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/popup.qml b/tests/auto/qquickmenu/data/popup.qml index 6040e8ba..e044a527 100644 --- a/tests/auto/qquickmenu/data/popup.qml +++ b/tests/auto/qquickmenu/data/popup.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml index 6f0acd3a..bcc46c08 100644 --- a/tests/auto/qquickmenu/data/pressAndHold.qml +++ b/tests/auto/qquickmenu/data/pressAndHold.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenu/data/removeTakeItem.qml b/tests/auto/qquickmenu/data/removeTakeItem.qml index 89090fb6..8352bffd 100644 --- a/tests/auto/qquickmenu/data/removeTakeItem.qml +++ b/tests/auto/qquickmenu/data/removeTakeItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml index 2172f86a..40f44281 100644 --- a/tests/auto/qquickmenu/data/repeater.qml +++ b/tests/auto/qquickmenu/data/repeater.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 200 diff --git a/tests/auto/qquickmenu/data/subMenus.qml b/tests/auto/qquickmenu/data/subMenus.qml index 49811bc2..413e442d 100644 --- a/tests/auto/qquickmenu/data/subMenus.qml +++ b/tests/auto/qquickmenu/data/subMenus.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 600 diff --git a/tests/auto/qquickmenu/data/windowScrollable.qml b/tests/auto/qquickmenu/data/windowScrollable.qml index d21289d3..0d495242 100644 --- a/tests/auto/qquickmenu/data/windowScrollable.qml +++ b/tests/auto/qquickmenu/data/windowScrollable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.11 Window { diff --git a/tests/auto/qquickmenu/qquickmenu.pro b/tests/auto/qquickmenu/qquickmenu.pro index 7e1080b9..ee539842 100644 --- a/tests/auto/qquickmenu/qquickmenu.pro +++ b/tests/auto/qquickmenu/qquickmenu.pro @@ -1,6 +1,5 @@ CONFIG += testcase TARGET = tst_qquickmenu -HEADERS += ../shared/menuutil.h SOURCES += tst_qquickmenu.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 27cd8aaa..b46b8781 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -43,8 +43,6 @@ #include <QtQml/qqmlcontext.h> #include <QtQuick/qquickview.h> #include <QtQuick/private/qquickitem_p.h> -#include <QtQuick/private/qquicklistview_p.h> -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" @@ -88,7 +86,6 @@ private slots: void addRemoveSubMenus(); void scrollable_data(); void scrollable(); - void delegateFromSeparateComponent(); }; void tst_QQuickMenu::defaults() @@ -148,7 +145,6 @@ void tst_QQuickMenu::mouse() menu->open(); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - waitForMenuListViewPolish(menu); QQuickItem *firstItem = menu->itemAt(0); QSignalSpy clickedSpy(firstItem, SIGNAL(clicked())); @@ -272,8 +268,6 @@ void tst_QQuickMenu::contextMenuKeyboard() QCOMPARE(visibleSpy.count(), 1); QVERIFY(menu->isVisible()); QVERIFY(window->overlay()->childItems().contains(menu->contentItem()->parentItem())); - waitForMenuListViewPolish(menu); - QVERIFY(!firstItem->hasActiveFocus()); QVERIFY(!firstItem->property("highlighted").toBool()); QCOMPARE(menu->currentIndex(), -1); @@ -940,7 +934,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(!subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(mainMenu); // open the sub-menu with mouse click QQuickMenuItem *subMenu1Item = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(1)); @@ -951,7 +944,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(subMenu1); // open the cascading sub-sub-menu with mouse hover QQuickMenuItem *subSubMenu1Item = qobject_cast<QQuickMenuItem *>(subMenu1->itemAt(2)); @@ -962,7 +954,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - QVERIFY(subSubMenu1Item->isHovered()); if (cascade) QTRY_VERIFY(subSubMenu1->isVisible()); @@ -982,7 +973,6 @@ void tst_QQuickMenu::subMenuMouse() QVERIFY(subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - QVERIFY(subSubMenu1Item->isHovered()); if (cascade) QTRY_VERIFY(subSubMenu1->isVisible()); @@ -1209,7 +1199,6 @@ void tst_QQuickMenu::subMenuPosition() QVERIFY(!subMenu1->isVisible()); QVERIFY(!subMenu2->isVisible()); QVERIFY(!subSubMenu1->isVisible()); - waitForMenuListViewPolish(mainMenu); // open the sub-menu (never flips) QQuickMenuItem *subMenu1Item = qobject_cast<QQuickMenuItem *>(mainMenu->itemAt(1)); @@ -1344,96 +1333,9 @@ void tst_QQuickMenu::scrollable() QVERIFY(menu->isVisible()); QQuickItem *contentItem = menu->contentItem(); - // Can only be scrollable if it exceeds the height of the window. - QTRY_VERIFY(contentItem->property("contentHeight").toReal() > window->height()); QCOMPARE(contentItem->property("interactive").toBool(), true); } -// QTBUG-67559 -// Test that Actions and MenuItems declared as children of a Menu have the -// correct delegate when it is declared outside of the Menu as a Component. -void tst_QQuickMenu::delegateFromSeparateComponent() -{ - QQuickApplicationHelper helper(this, QLatin1String("delegateFromSeparateComponent.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - const QColor green = QColor::fromRgb(0x00ff00); - - QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); - QVERIFY(menu); - - // "Action Item 1" - QQuickMenuItem *actionItem1 = qobject_cast<QQuickMenuItem*>(menu->itemAt(0)); - QVERIFY(actionItem1); - QCOMPARE(actionItem1->text(), QLatin1String("Action Item 1")); - - QQuickItem *actionItem1Bg = actionItem1->property("background").value<QQuickItem*>(); - QVERIFY(actionItem1Bg); - QCOMPARE(actionItem1Bg->property("color").value<QColor>(), green); - - // "Sub-menu" - QQuickMenuItem *subMenuItem = qobject_cast<QQuickMenuItem*>(menu->itemAt(1)); - QVERIFY(subMenuItem); - QCOMPARE(subMenuItem->text(), QLatin1String("Sub-menu")); - - QQuickItem *subMenuItemBg = subMenuItem->property("background").value<QQuickItem*>(); - QVERIFY(subMenuItemBg); - QCOMPARE(subMenuItemBg->property("color").value<QColor>(), green); - - QQuickMenu *subMenu = subMenuItem->subMenu(); - QVERIFY(subMenu); - - // "Sub-menu Action Item 1" - QQuickMenuItem *subMenuActionItem1 = qobject_cast<QQuickMenuItem*>(subMenu->itemAt(0)); - QVERIFY(subMenuActionItem1); - QCOMPARE(subMenuActionItem1->text(), QLatin1String("Sub-menu Action Item 1")); - - QQuickItem *subMenuActionItem1Bg = subMenuActionItem1->property("background").value<QQuickItem*>(); - QVERIFY(subMenuActionItem1Bg); - QCOMPARE(subMenuActionItem1Bg->property("color").value<QColor>(), green); - - // "Sub-sub-menu" - QQuickMenuItem *subSubMenuItem = qobject_cast<QQuickMenuItem*>(subMenu->itemAt(1)); - QVERIFY(subSubMenuItem); - QCOMPARE(subSubMenuItem->text(), QLatin1String("Sub-sub-menu")); - - QQuickItem *subSubMenuItemBg = subSubMenuItem->property("background").value<QQuickItem*>(); - QVERIFY(subSubMenuItemBg); - QCOMPARE(subSubMenuItemBg->property("color").value<QColor>(), green); - - QQuickMenu *subSubMenu = subSubMenuItem->subMenu(); - QVERIFY(subSubMenu); - - // "Sub-sub-menu Action Item 1" - QQuickMenuItem *subSubMenuActionItem1 = qobject_cast<QQuickMenuItem*>(subSubMenu->itemAt(0)); - QVERIFY(subSubMenuActionItem1); - QCOMPARE(subSubMenuActionItem1->text(), QLatin1String("Sub-sub-menu Action Item 1")); - - QQuickItem *subSubMenuActionItem1Bg = subSubMenuActionItem1->property("background").value<QQuickItem*>(); - QVERIFY(subSubMenuActionItem1Bg); - QCOMPARE(subSubMenuActionItem1Bg->property("color").value<QColor>(), green); - - // "Sub-menu Action Item 2" - QQuickMenuItem *subMenuActionItem2 = qobject_cast<QQuickMenuItem*>(subMenu->itemAt(2)); - QVERIFY(subMenuActionItem2); - QCOMPARE(subMenuActionItem2->text(), QLatin1String("Sub-menu Action Item 2")); - - QQuickItem *subMenuActionItem2Bg = subMenuActionItem2->property("background").value<QQuickItem*>(); - QVERIFY(subMenuActionItem2Bg); - QCOMPARE(subMenuActionItem2Bg->property("color").value<QColor>(), green); - - // "Action Item 2" - QQuickMenuItem *actionItem2 = qobject_cast<QQuickMenuItem*>(menu->itemAt(2)); - QVERIFY(actionItem2); - QCOMPARE(actionItem2->text(), QLatin1String("Action Item 2")); - - QQuickItem *actionItem2Bg = actionItem2->property("background").value<QQuickItem*>(); - QVERIFY(actionItem2Bg); - QCOMPARE(actionItem2Bg->property("color").value<QColor>(), green); -} - QTEST_MAIN(tst_QQuickMenu) #include "tst_qquickmenu.moc" diff --git a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml index 9d58e8c6..82321bca 100644 --- a/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml +++ b/tests/auto/qquickmenubar/data/delegateFromSeparateComponent.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 800 diff --git a/tests/auto/qquickmenubar/data/empty.qml b/tests/auto/qquickmenubar/data/empty.qml index 6ed0a141..87a3d73d 100644 --- a/tests/auto/qquickmenubar/data/empty.qml +++ b/tests/auto/qquickmenubar/data/empty.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MenuBar { } diff --git a/tests/auto/qquickmenubar/data/menubar.qml b/tests/auto/qquickmenubar/data/menubar.qml index 606dd92c..1ef83a6f 100644 --- a/tests/auto/qquickmenubar/data/menubar.qml +++ b/tests/auto/qquickmenubar/data/menubar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickmenubar/qquickmenubar.pro b/tests/auto/qquickmenubar/qquickmenubar.pro index d2f28e47..b7d41f0f 100644 --- a/tests/auto/qquickmenubar/qquickmenubar.pro +++ b/tests/auto/qquickmenubar/qquickmenubar.pro @@ -1,6 +1,5 @@ CONFIG += testcase TARGET = tst_qquickmenubar -HEADERS += ../shared/menuutil.h SOURCES += tst_qquickmenubar.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp index cfcdee5e..19d67eac 100644 --- a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp +++ b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp @@ -36,8 +36,6 @@ #include <QtTest> #include <QtQml> -#include <QtQuick/private/qquicklistview_p.h> -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" #include "../shared/qtest_quickcontrols.h" @@ -45,7 +43,6 @@ #include <QtQuickTemplates2/private/qquickapplicationwindow_p.h> #include <QtQuickTemplates2/private/qquickmenu_p.h> #include <QtQuickTemplates2/private/qquickmenubar_p.h> -#include <QtQuickTemplates2/private/qquickmenubar_p_p.h> #include <QtQuickTemplates2/private/qquickmenubaritem_p.h> #include <QtQuickTemplates2/private/qquickmenuitem_p.h> @@ -63,7 +60,6 @@ private slots: void keys(); void mnemonics(); void addRemove(); - void delegateFromSeparateComponent(); }; void tst_qquickmenubar::delegate() @@ -108,13 +104,6 @@ void tst_qquickmenubar::mouse() QQuickMenuBarItem *viewMenuBarItem = qobject_cast<QQuickMenuBarItem *>(viewMenuBarMenu->parentItem()); QQuickMenuBarItem *helpMenuBarItem = qobject_cast<QQuickMenuBarItem *>(helpMenuBarMenu->parentItem()); QVERIFY(fileMenuBarItem && editMenuBarItem && viewMenuBarItem && helpMenuBarItem); - // Something about postponing delegate creation to component completion - // means that the fileMenuBarItem->isHighlighted() check below fails occasionally. - // Give it a chance to sort itself out before sending move events. - QQuickMenuBarPrivate *menuBarPrivate = QQuickMenuBarPrivate::get(menuBar); - menuBar->polish(); - QVERIFY(menuBarPrivate->polishScheduled); - QTRY_VERIFY(!menuBarPrivate->polishScheduled); // highlight a menubar item QTest::mouseMove(window.data(), fileMenuBarItem->mapToScene(QPointF(fileMenuBarItem->width() / 2, fileMenuBarItem->height() / 2)).toPoint()); @@ -157,7 +146,6 @@ void tst_qquickmenubar::mouse() QVERIFY(helpMenuBarMenu->isVisible()); QTRY_VERIFY(!editMenuBarMenu->isVisible()); QTRY_VERIFY(helpMenuBarMenu->isOpened()); - waitForMenuListViewPolish(helpMenuBarMenu); // trigger a menu item to close the menu QQuickMenuItem *aboutMenuItem = qobject_cast<QQuickMenuItem *>(helpMenuBarMenu->itemAt(0)); @@ -179,7 +167,6 @@ void tst_qquickmenubar::mouse() QVERIFY(viewMenuBarItem->isHighlighted()); QVERIFY(viewMenuBarMenu->isVisible()); QTRY_VERIFY(viewMenuBarMenu->isOpened()); - waitForMenuListViewPolish(viewMenuBarMenu); // trigger a menu item to open a sub-menu QQuickMenuItem *alignmentSubMenuItem = qobject_cast<QQuickMenuItem *>(viewMenuBarMenu->itemAt(0)); @@ -190,7 +177,6 @@ void tst_qquickmenubar::mouse() QVERIFY(viewMenuBarMenu->isVisible()); QVERIFY(alignmentSubMenu->isVisible()); QTRY_VERIFY(alignmentSubMenu->isOpened()); - waitForMenuListViewPolish(alignmentSubMenu); // trigger a menu item to open a sub-sub-menu QQuickMenuItem *verticalSubMenuItem = qobject_cast<QQuickMenuItem *>(alignmentSubMenu->itemAt(1)); @@ -202,7 +188,6 @@ void tst_qquickmenubar::mouse() QVERIFY(alignmentSubMenu->isVisible()); QVERIFY(verticalSubMenu->isVisible()); QTRY_VERIFY(verticalSubMenu->isOpened()); - waitForMenuListViewPolish(verticalSubMenu); // trigger a menu item to close the whole chain of menus QQuickMenuItem *centerMenuItem = qobject_cast<QQuickMenuItem *>(verticalSubMenu->itemAt(1)); @@ -579,32 +564,6 @@ void tst_qquickmenubar::addRemove() QVERIFY(menuBarItem1.isNull()); } -// QTBUG-67559 -// Test that Menus declared as children of a MenuBar have the -// correct delegate when it is declared outside of the MenuBar as a Component. -void tst_qquickmenubar::delegateFromSeparateComponent() -{ - QQuickApplicationHelper helper(this, QLatin1String("delegateFromSeparateComponent.qml")); - QQuickWindow *window = helper.window; - window->show(); - QVERIFY(QTest::qWaitForWindowActive(window)); - - const QColor green = QColor::fromRgb(0x00ff00); - - QQuickMenuBar *menuBar = window->property("menuBar").value<QQuickMenuBar*>(); - QVERIFY(menuBar); - - QQuickMenu *menu = qobject_cast<QQuickMenu*>(menuBar->menuAt(0)); - QVERIFY(menu); - - QQuickMenuBarItem *menuBarItem = qobject_cast<QQuickMenuBarItem *>(menu->parentItem()); - QVERIFY(menuBarItem); - - QQuickItem *menuBarItemBg = menuBarItem->property("background").value<QQuickItem*>(); - QVERIFY(menuBarItemBg); - QCOMPARE(menuBarItemBg->property("color").value<QColor>(), green); -} - QTEST_QUICKCONTROLS_MAIN(tst_qquickmenubar) #include "tst_qquickmenubar.moc" diff --git a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml index 7ef07a1c..4b9ac278 100644 --- a/tests/auto/qquickninepatchimage/data/ninepatchimage.qml +++ b/tests/auto/qquickninepatchimage/data/ninepatchimage.qml @@ -1,7 +1,7 @@ -import QtQuick.Controls 2.3 -import QtQuick.Controls.impl 2.3 -import QtQuick.Controls.Imagine 2.3 -import QtQuick.Controls.Imagine.impl 2.3 +import QtQuick.Controls 2.12 +import QtQuick.Controls.impl 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Imagine.impl 2.12 NinePatchImage { } diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml index ee0295c1..ed9b65e1 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml index cb215f9b..d089fbbb 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml index a8137b34..20bd7941 100644 --- a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml +++ b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/qquickpopup/data/applicationwindow-hover.qml index 8cec6ba7..7b688147 100644 --- a/tests/auto/qquickpopup/data/applicationwindow-hover.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-hover.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml index a89bd0f6..de27d7ec 100644 --- a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml +++ b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/auto/qquickpopup/data/applicationwindow.qml b/tests/auto/qquickpopup/data/applicationwindow.qml index 659aa843..3ce8a718 100644 --- a/tests/auto/qquickpopup/data/applicationwindow.qml +++ b/tests/auto/qquickpopup/data/applicationwindow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml index f41516c8..4f18fc13 100644 --- a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml +++ b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/cursor.qml b/tests/auto/qquickpopup/data/cursor.qml index fd4475a0..4391f7a0 100644 --- a/tests/auto/qquickpopup/data/cursor.qml +++ b/tests/auto/qquickpopup/data/cursor.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/grabber.qml b/tests/auto/qquickpopup/data/grabber.qml index b9995b54..6a6d6d65 100644 --- a/tests/auto/qquickpopup/data/grabber.qml +++ b/tests/auto/qquickpopup/data/grabber.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/nested.qml b/tests/auto/qquickpopup/data/nested.qml index 48e51fc8..4ebdfb0c 100644 --- a/tests/auto/qquickpopup/data/nested.qml +++ b/tests/auto/qquickpopup/data/nested.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/qquickpopup/data/orientation.qml b/tests/auto/qquickpopup/data/orientation.qml index cbf69b2b..a1cc9c0e 100644 --- a/tests/auto/qquickpopup/data/orientation.qml +++ b/tests/auto/qquickpopup/data/orientation.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 600 diff --git a/tests/auto/qquickpopup/data/window-hover.qml b/tests/auto/qquickpopup/data/window-hover.qml index 669afb08..0bf00660 100644 --- a/tests/auto/qquickpopup/data/window-hover.qml +++ b/tests/auto/qquickpopup/data/window-hover.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickpopup/data/window-wheel.qml b/tests/auto/qquickpopup/data/window-wheel.qml index 45c09b45..37edee95 100644 --- a/tests/auto/qquickpopup/data/window-wheel.qml +++ b/tests/auto/qquickpopup/data/window-wheel.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { id: window diff --git a/tests/auto/qquickpopup/data/window.qml b/tests/auto/qquickpopup/data/window.qml index 962ab573..0e15e838 100644 --- a/tests/auto/qquickpopup/data/window.qml +++ b/tests/auto/qquickpopup/data/window.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 400 diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index 6c860d6e..9230116b 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -36,7 +36,6 @@ #include <QtTest/qtest.h> #include <QtTest/qsignalspy.h> -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" #include "../shared/qtest_quickcontrols.h" @@ -859,7 +858,6 @@ void tst_QQuickPopup::grabber() menu->open(); QTRY_COMPARE(menu->isOpened(), true); - waitForMenuListViewPolish(menu); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); @@ -882,7 +880,6 @@ void tst_QQuickPopup::grabber() menu->open(); QTRY_COMPARE(menu->isOpened(), true); - waitForMenuListViewPolish(menu); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); @@ -974,7 +971,6 @@ void tst_QQuickPopup::closeOnEscapeWithNestedPopups() QQuickPopup *optionsMenu = window->findChild<QQuickPopup*>("optionsMenu"); QVERIFY(optionsMenu); QTRY_VERIFY(optionsMenu->isVisible()); - waitForMenuListViewPolish(optionsMenu); QQuickItem *settingsMenuItem = window->findChild<QQuickItem*>("settingsMenuItem"); QVERIFY(settingsMenuItem); diff --git a/tests/auto/qquickstyle/data/dependencies.qml b/tests/auto/qquickstyle/data/dependencies.qml index cd3e88ba..dac5f935 100644 --- a/tests/auto/qquickstyle/data/dependencies.qml +++ b/tests/auto/qquickstyle/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml index 5b08222c..eaeeadcd 100644 --- a/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml +++ b/tests/auto/qquickstyle/data/dummyStyles/DummyStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml b/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml index 5b08222c..eaeeadcd 100644 --- a/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles1/QrcStyle1/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml b/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml index 5b08222c..eaeeadcd 100644 --- a/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles2/QrcStyle2/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml b/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml index 5b08222c..eaeeadcd 100644 --- a/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml index 5b08222c..eaeeadcd 100644 --- a/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml +++ b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp index 8d09a293..3f55bcfb 100644 --- a/tests/auto/qquickstyle/tst_qquickstyle.cpp +++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp @@ -39,6 +39,7 @@ #include <QtQml/qqmlcomponent.h> #include <QtQuickControls2/qquickstyle.h> #include <QtQuickControls2/private/qquickstyle_p.h> +#include <QtQuickTemplates2/private/qquicktheme_p.h> #include <QtGui/private/qguiapplication_p.h> #include "../shared/util.h" @@ -102,6 +103,10 @@ void tst_QQuickStyle::lookup() loadControls(); + // The font size for editors in the (default) Normal variant is 16. + // If this is wrong, the style plugin may not have been loaded. + QCOMPARE(QQuickTheme::instance()->font(QQuickTheme::TextArea).pixelSize(), 16); + QCOMPARE(QQuickStyle::name(), QString("Material")); QVERIFY(!QQuickStyle::path().isEmpty()); } @@ -159,7 +164,11 @@ void tst_QQuickStyle::availableStyles() QQuickStyle::addStylePath(path); QStringList paths = QQuickStylePrivate::stylePaths(); +#ifndef Q_OS_WIN QVERIFY(paths.contains(path)); +#else + QVERIFY(paths.contains(path, Qt::CaseInsensitive)); +#endif const QStringList styles = QQuickStyle::availableStyles(); QVERIFY(!styles.isEmpty()); diff --git a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml b/tests/auto/qquickstyleselector/ResourceStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml +++ b/tests/auto/qquickstyleselector/ResourceStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Button.qml b/tests/auto/qquickstyleselector/data/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/Button.qml +++ b/tests/auto/qquickstyleselector/data/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Control.qml b/tests/auto/qquickstyleselector/data/Control.qml index 697662f6..6820b57d 100644 --- a/tests/auto/qquickstyleselector/data/Control.qml +++ b/tests/auto/qquickstyleselector/data/Control.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Control { } diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml index 8879d93f..23699c1c 100644 --- a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml +++ b/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Label { } diff --git a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml b/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Label.qml b/tests/auto/qquickstyleselector/data/Label.qml index 8879d93f..23699c1c 100644 --- a/tests/auto/qquickstyleselector/data/Label.qml +++ b/tests/auto/qquickstyleselector/data/Label.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Label { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickuniversalstyle/data/tst_universal.qml b/tests/auto/qquickuniversalstyle/data/tst_universal.qml index a5fa763b..0926cae3 100644 --- a/tests/auto/qquickuniversalstyle/data/tst_universal.qml +++ b/tests/auto/qquickuniversalstyle/data/tst_universal.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 TestCase { id: testCase diff --git a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml index 94bf29aa..7abc8b13 100644 --- a/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml +++ b/tests/auto/qquickuniversalstyleconf/data/applicationwindow.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Universal 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/revisions/data/dependencies.qml b/tests/auto/revisions/data/dependencies.qml index 6f21af18..e276ba59 100644 --- a/tests/auto/revisions/data/dependencies.qml +++ b/tests/auto/revisions/data/dependencies.qml @@ -1,6 +1,6 @@ -import QtQuick 2.8 -import QtQuick.Controls 2.0 -import QtQuick.Controls.Material 2.0 -import QtQuick.Controls.Universal 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Universal 2.12 Control { } diff --git a/tests/auto/sanity/data/dependencies.qml b/tests/auto/sanity/data/dependencies.qml index cd3e88ba..dac5f935 100644 --- a/tests/auto/sanity/data/dependencies.qml +++ b/tests/auto/sanity/data/dependencies.qml @@ -1,4 +1,4 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Control { } diff --git a/tests/auto/shared/menuutil.h b/tests/auto/shared/menuutil.h deleted file mode 100644 index 067b7e55..00000000 --- a/tests/auto/shared/menuutil.h +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QQUICKMENUTUTIL_H -#define QQUICKMENUTUTIL_H - -#include <QtQuick/private/qquickitem_p.h> -#include <QtQuick/private/qquicklistview_p.h> - -/* - QQuickMenuPrivate::insertItem() culls newly added items to ensure - that they don't show up when they shouldn't, but now that QQuickMenu - postpones item creation until after component completion (QTBUG-67559), - the culled flag being set means that mouse events don't get delivered - to menu items (see the culled check in QQuickWindowPrivate::pointerTargets()). - - ListView unculls the items in FxViewItem::setVisible(), and waiting until - polishes are finished is a reliable way of ensuring that that happens - before we send mouse events. -*/ -#define waitForMenuListViewPolish(menu) \ -{ \ - const auto listView = qobject_cast<QQuickListView*>((menu)->contentItem()); \ - Q_ASSERT(listView); \ - QTRY_COMPARE(QQuickItemPrivate::get(listView)->polishScheduled, false); \ -} - -#endif // QQUICKMENUTUTIL_H diff --git a/tests/auto/snippets/data/dependencies.qml b/tests/auto/snippets/data/dependencies.qml index 6c897566..db0a968d 100644 --- a/tests/auto/snippets/data/dependencies.qml +++ b/tests/auto/snippets/data/dependencies.qml @@ -1,8 +1,8 @@ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Universal 2.12 import Qt.labs.calendar 1.0 Control { } diff --git a/tests/benchmarks/creationtime/data/dependencies.qml b/tests/benchmarks/creationtime/data/dependencies.qml index c284d94c..130ee37d 100644 --- a/tests/benchmarks/creationtime/data/dependencies.qml +++ b/tests/benchmarks/creationtime/data/dependencies.qml @@ -1,9 +1,9 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Fusion 2.3 -import QtQuick.Controls.Imagine 2.3 -import QtQuick.Controls.Material 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Universal 2.12 import Qt.labs.calendar 1.0 Control { } diff --git a/tests/benchmarks/objectcount/data/dependencies.qml b/tests/benchmarks/objectcount/data/dependencies.qml index c284d94c..130ee37d 100644 --- a/tests/benchmarks/objectcount/data/dependencies.qml +++ b/tests/benchmarks/objectcount/data/dependencies.qml @@ -1,9 +1,9 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Fusion 2.3 -import QtQuick.Controls.Imagine 2.3 -import QtQuick.Controls.Material 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Fusion 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Universal 2.12 import Qt.labs.calendar 1.0 Control { } diff --git a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml index e6decdf0..02074cb0 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_abstractbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml index a5a6a72d..c6e53bcf 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_busyindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_button.qml b/tests/benchmarks/qmlbench/creation/delegates_button.qml index 05abe1a0..5e6cc12f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_button.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_button.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml index 6969ebf7..73b18865 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml index eda99905..b4fde74a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_checkdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml index 22552bf8..6519fc77 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_combobox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_combobox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_container.qml b/tests/benchmarks/qmlbench/creation/delegates_container.qml index 6df6d83e..eb684a74 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_container.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_container.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_control.qml b/tests/benchmarks/qmlbench/creation/delegates_control.qml index bf08a7eb..da4263dc 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_control.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_control.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml index d88996d9..ae8aa0b7 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_delaybutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dial.qml b/tests/benchmarks/qmlbench/creation/delegates_dial.qml index 118bac61..6fd33c70 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dial.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dial.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml index b653252c..36b1fbe1 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialog.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialog.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml index e676d144..e5fac0eb 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_dialogbuttonbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml index 886a2c65..9c1e74b5 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_drawer.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_drawer.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_frame.qml b/tests/benchmarks/qmlbench/creation/delegates_frame.qml index a511f508..27852898 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_frame.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_frame.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml index 146cd400..ccfe2927 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_groupbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml index 62f6558f..8c7f67dd 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_itemdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_label.qml b/tests/benchmarks/qmlbench/creation/delegates_label.qml index 8a22226b..3c3e76b1 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_label.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_label.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menu.qml b/tests/benchmarks/qmlbench/creation/delegates_menu.qml index 1ef29da1..1566f40a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menu.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menu.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml index 6bf481e8..5c700707 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuitem.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml index 8322a0c5..59abe333 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_menuseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_page.qml b/tests/benchmarks/qmlbench/creation/delegates_page.qml index 827bf004..9c9124dc 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_page.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_page.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml index 1bcb3a48..37eee037 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pageindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_pane.qml b/tests/benchmarks/qmlbench/creation/delegates_pane.qml index 55a26557..e811df93 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_pane.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_pane.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_popup.qml b/tests/benchmarks/qmlbench/creation/delegates_popup.qml index acb4ce25..9effd917 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_popup.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_popup.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml index 8eb06d0f..4bb773f2 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_progressbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml index 47a3ed98..3236835f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiobutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml index 01d21a12..b6ffe174 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_radiodelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml index afa23d2e..a595bd7a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_rangeslider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml index 79495a91..572bf5e9 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_roundbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml index 1edb9062..2e6fc1fd 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml index 8e8b616f..fd9e52e6 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollindicator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml index da8630bc..0daa44dd 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_scrollview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_slider.qml b/tests/benchmarks/qmlbench/creation/delegates_slider.qml index 55e0c8ef..44dac819 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_slider.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_slider.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml index d4a3900a..90695102 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_spinbox.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml index 620b3874..e2644aef 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_stackview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_stackview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml index 2f4624c5..752dc37b 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipedelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml index d81203cf..0a922343 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_swipeview.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switch.qml b/tests/benchmarks/qmlbench/creation/delegates_switch.qml index 49104a1e..9381342d 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switch.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switch.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml index 1122d712..f41281fa 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_switchdelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml index d3243d82..95bb7291 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml index 713e4ea5..dc549a3a 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tabbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml index 68a79684..ab383ad4 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textarea.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textarea.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml index fe500d40..32f31fe8 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_textfield.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_textfield.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml index fd966c57..38e9a59f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolbutton.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml index 6031d4bc..e3db91f8 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_toolseparator.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml index 7efa4b24..f8e7a283 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tooltip.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml index 4322536d..4af07b7f 100644 --- a/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml +++ b/tests/benchmarks/qmlbench/creation/delegates_tumbler.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QmlBench 1.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 CreationBenchmark { id: root diff --git a/tests/manual/buttons/ButtonLoader.qml b/tests/manual/buttons/ButtonLoader.qml index 47b265ec..574997e1 100644 --- a/tests/manual/buttons/ButtonLoader.qml +++ b/tests/manual/buttons/ButtonLoader.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { id: root diff --git a/tests/manual/buttons/buttons.qml b/tests/manual/buttons/buttons.qml index e75cbbda..0848038d 100644 --- a/tests/manual/buttons/buttons.qml +++ b/tests/manual/buttons/buttons.qml @@ -47,10 +47,10 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Universal 2.12 ApplicationWindow { id: window diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 30f0500c..4182a654 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 -import QtQuick.Templates 2.1 as T -import QtQuick.Layouts 1.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import QtQuick.Layouts 1.12 ApplicationWindow { visible: true diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml index a2ea66cb..b0504cd7 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: busyIndicator.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml b/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml index f292f3e7..c52c0391 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-button-flat.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml b/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml index 1d0a3ada..6398df50 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-button-highlighted.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/gifs/data/qtquickcontrols2-button.qml index 9360b61a..6361174f 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-button.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml index 9062af92..b6f31682 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkbox-tristate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.0 Window { diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml index 2810e7c2..1e1348f5 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.0 Window { diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml index 528c8e80..767f80dc 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate-tristate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.0 Window { diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml index dd3b1445..d222b21f 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-checkdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml b/tests/manual/gifs/data/qtquickcontrols2-combobox.qml index 5be55e7f..bd46b54d 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-combobox.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-combobox.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.0 Window { diff --git a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml b/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml index 1f0da14f..b0feddcb 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-delaybutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 Window { width: button.width diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml index 13644b12..04f167a2 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: dial.implicitWidth + 20 diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml index 1bc22fb0..e00139f0 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: dial.implicitWidth + 20 diff --git a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml b/tests/manual/gifs/data/qtquickcontrols2-drawer.qml index dd1f2f59..690dfdc4 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-drawer.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-drawer.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Window 2.0 ApplicationWindow { diff --git a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml index 3ed15f28..b0188edb 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-itemdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-menu.qml b/tests/manual/gifs/data/qtquickcontrols2-menu.qml index 1fd0b5ba..39403e06 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-menu.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-menu.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 // TODO: restore and finish https://codereview.qt-project.org/#/c/123948/ ApplicationWindow { diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml b/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml index 3671d019..6d2c50b2 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-progressbar-indeterminate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: progressBar.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml b/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml index af96ae7a..a8f751ce 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-progressbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: progressBar.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml index 7e6d4de3..1e640ced 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import QtQuick.Window 2.0 Window { diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml index 6cffbaa2..eaa1ff7a 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-radiodelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml index c3b328ab..b30711b4 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-rangeslider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml b/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml index d58162fc..27b6b280 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-scrollbar-snap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml b/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml index 72ca9e67..573c408b 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-scrollbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml index ae4b4235..1cdd1b61 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-scrollindicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml b/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml index fa92e4bc..ff7dd780 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-slider-snap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/gifs/data/qtquickcontrols2-slider.qml index d3685d36..689e50f2 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-slider.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml index ebd1857c..9c3ad1f1 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-pop.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml index e4bdd48e..cf3e8c3c 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-push.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml index 9d96539a..2c68a3cb 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-replace.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml b/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml index 89649b3a..afb1f242 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-stackview-unwind.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 ApplicationWindow { width: 160 diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml index b8ecf62c..6025b62b 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-behind.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: swipeDelegate.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml index 5eb7e1b6..da9d0fb5 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate-leading-trailing.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: swipeDelegate.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml index b143d81b..745432cb 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipedelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: swipeDelegate.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml b/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml index 9ae09ea1..d7d8829a 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-swipeview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.12 Window { width: 300 diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/gifs/data/qtquickcontrols2-switch.qml index dc3724c4..7e98d9db 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-switch.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: 100 diff --git a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml index 73f9f9e5..2a70e484 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-switchdelegate.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: column.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml index accff15a..e01c7665 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import QtQuick.Window 2.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: 300 diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml index 07531154..77d17f11 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.8 +import QtQuick 2.12 import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.12 Window { width: frame.implicitWidth + 10 diff --git a/tests/manual/screenshots/screenshots.qml b/tests/manual/screenshots/screenshots.qml index 20275b17..2ab684c1 100644 --- a/tests/manual/screenshots/screenshots.qml +++ b/tests/manual/screenshots/screenshots.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 import Qt.labs.folderlistmodel 2.1 ApplicationWindow { diff --git a/tests/manual/shared/FontAwesome.qml b/tests/manual/shared/FontAwesome.qml index 50053664..9e387594 100644 --- a/tests/manual/shared/FontAwesome.qml +++ b/tests/manual/shared/FontAwesome.qml @@ -47,7 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 pragma Singleton diff --git a/tests/manual/shared/FontAwesomeIcon.qml b/tests/manual/shared/FontAwesomeIcon.qml index 152b6080..f46ed364 100644 --- a/tests/manual/shared/FontAwesomeIcon.qml +++ b/tests/manual/shared/FontAwesomeIcon.qml @@ -47,7 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.12 import "qrc:/shared" Text { diff --git a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml b/tests/manual/styles-cover-flow/CoverFlowDelegate.qml index 8b220269..474a189a 100644 --- a/tests/manual/styles-cover-flow/CoverFlowDelegate.qml +++ b/tests/manual/styles-cover-flow/CoverFlowDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtGraphicalEffects 1.0 -import QtQuick 2.10 +import QtGraphicalEffects 1.12 +import QtQuick 2.12 Item { id: root diff --git a/tests/manual/styles-cover-flow/CoverFlowPath.qml b/tests/manual/styles-cover-flow/CoverFlowPath.qml index f50cf31d..37e7f894 100644 --- a/tests/manual/styles-cover-flow/CoverFlowPath.qml +++ b/tests/manual/styles-cover-flow/CoverFlowPath.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 Path { // Point 1 diff --git a/tests/manual/styles-cover-flow/styles-cover-flow.qml b/tests/manual/styles-cover-flow/styles-cover-flow.qml index 3d8aea0f..273f0869 100644 --- a/tests/manual/styles-cover-flow/styles-cover-flow.qml +++ b/tests/manual/styles-cover-flow/styles-cover-flow.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Window 2.3 +import QtQuick 2.12 +import QtQuick.Window 2.12 Window { // Different delegate positions and widths and window background colors diff --git a/tests/manual/styles/styles.qml b/tests/manual/styles/styles.qml index 84a3fde8..7c4721d1 100644 --- a/tests/manual/styles/styles.qml +++ b/tests/manual/styles/styles.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 ApplicationWindow { id: window diff --git a/tests/manual/systemtrayicon/systemtrayicon.qml b/tests/manual/systemtrayicon/systemtrayicon.qml index 8431ab30..a7e656d4 100644 --- a/tests/manual/systemtrayicon/systemtrayicon.qml +++ b/tests/manual/systemtrayicon/systemtrayicon.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import Qt.labs.platform 1.0 ApplicationWindow { diff --git a/tests/manual/testbench/ColorEditor.qml b/tests/manual/testbench/ColorEditor.qml index 83f8f2b0..1e10d6d2 100644 --- a/tests/manual/testbench/ColorEditor.qml +++ b/tests/manual/testbench/ColorEditor.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 RowLayout { property alias labelText: label.text diff --git a/tests/manual/testbench/ControlContainer.qml b/tests/manual/testbench/ControlContainer.qml index b6bd8542..095d3822 100644 --- a/tests/manual/testbench/ControlContainer.qml +++ b/tests/manual/testbench/ControlContainer.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.10 +import QtQuick 2.12 Item { id: container diff --git a/tests/manual/testbench/ExampleContainer.qml b/tests/manual/testbench/ExampleContainer.qml index ffada686..5d2ac758 100644 --- a/tests/manual/testbench/ExampleContainer.qml +++ b/tests/manual/testbench/ExampleContainer.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 Frame { id: container diff --git a/tests/manual/testbench/SettingsDialog.qml b/tests/manual/testbench/SettingsDialog.qml index ef38c496..71b4c342 100644 --- a/tests/manual/testbench/SettingsDialog.qml +++ b/tests/manual/testbench/SettingsDialog.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 -import QtQuick.Layouts 1.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 +import QtQuick.Layouts 1.12 import App 1.0 diff --git a/tests/manual/testbench/controls/BusyIndicator.qml b/tests/manual/testbench/controls/BusyIndicator.qml index 97456a93..22b3d98a 100644 --- a/tests/manual/testbench/controls/BusyIndicator.qml +++ b/tests/manual/testbench/controls/BusyIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Button.qml b/tests/manual/testbench/controls/Button.qml index b1152481..44ddfee0 100644 --- a/tests/manual/testbench/controls/Button.qml +++ b/tests/manual/testbench/controls/Button.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/CheckBox.qml b/tests/manual/testbench/controls/CheckBox.qml index 73f94857..b79d800d 100644 --- a/tests/manual/testbench/controls/CheckBox.qml +++ b/tests/manual/testbench/controls/CheckBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/CheckDelegate.qml b/tests/manual/testbench/controls/CheckDelegate.qml index b742b170..c8089fab 100644 --- a/tests/manual/testbench/controls/CheckDelegate.qml +++ b/tests/manual/testbench/controls/CheckDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ComboBox.qml b/tests/manual/testbench/controls/ComboBox.qml index c9b8498f..335eeb56 100644 --- a/tests/manual/testbench/controls/ComboBox.qml +++ b/tests/manual/testbench/controls/ComboBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/DelayButton.qml b/tests/manual/testbench/controls/DelayButton.qml index af52e067..ae887ef3 100644 --- a/tests/manual/testbench/controls/DelayButton.qml +++ b/tests/manual/testbench/controls/DelayButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Dial.qml b/tests/manual/testbench/controls/Dial.qml index 5dc8c356..06b91076 100644 --- a/tests/manual/testbench/controls/Dial.qml +++ b/tests/manual/testbench/controls/Dial.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Dialog.qml b/tests/manual/testbench/controls/Dialog.qml index 7b8eb720..52aa923e 100644 --- a/tests/manual/testbench/controls/Dialog.qml +++ b/tests/manual/testbench/controls/Dialog.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 // TODO QtObject { diff --git a/tests/manual/testbench/controls/Frame.qml b/tests/manual/testbench/controls/Frame.qml index c0348025..c7b176fb 100644 --- a/tests/manual/testbench/controls/Frame.qml +++ b/tests/manual/testbench/controls/Frame.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/GroupBox.qml b/tests/manual/testbench/controls/GroupBox.qml index a99a998a..eda7ad79 100644 --- a/tests/manual/testbench/controls/GroupBox.qml +++ b/tests/manual/testbench/controls/GroupBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ItemDelegate.qml b/tests/manual/testbench/controls/ItemDelegate.qml index 44882df9..8cf348d4 100644 --- a/tests/manual/testbench/controls/ItemDelegate.qml +++ b/tests/manual/testbench/controls/ItemDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Label.qml b/tests/manual/testbench/controls/Label.qml index c0d980e8..92192e09 100644 --- a/tests/manual/testbench/controls/Label.qml +++ b/tests/manual/testbench/controls/Label.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Menu.qml b/tests/manual/testbench/controls/Menu.qml index c449dd47..3bb54009 100644 --- a/tests/manual/testbench/controls/Menu.qml +++ b/tests/manual/testbench/controls/Menu.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 // TODO QtObject { diff --git a/tests/manual/testbench/controls/MenuBar.qml b/tests/manual/testbench/controls/MenuBar.qml index 00db9af1..77a7da2b 100644 --- a/tests/manual/testbench/controls/MenuBar.qml +++ b/tests/manual/testbench/controls/MenuBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 // TODO QtObject { diff --git a/tests/manual/testbench/controls/Page.qml b/tests/manual/testbench/controls/Page.qml index 117359f9..add9cc09 100644 --- a/tests/manual/testbench/controls/Page.qml +++ b/tests/manual/testbench/controls/Page.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/PageIndicator.qml b/tests/manual/testbench/controls/PageIndicator.qml index e8d3f570..60094e4d 100644 --- a/tests/manual/testbench/controls/PageIndicator.qml +++ b/tests/manual/testbench/controls/PageIndicator.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Pane.qml b/tests/manual/testbench/controls/Pane.qml index d39adff4..c8b6c699 100644 --- a/tests/manual/testbench/controls/Pane.qml +++ b/tests/manual/testbench/controls/Pane.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ProgressBar.qml b/tests/manual/testbench/controls/ProgressBar.qml index 1fdb02b2..67047178 100644 --- a/tests/manual/testbench/controls/ProgressBar.qml +++ b/tests/manual/testbench/controls/ProgressBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RadioButton.qml b/tests/manual/testbench/controls/RadioButton.qml index b1a10e0f..b1fff6dc 100644 --- a/tests/manual/testbench/controls/RadioButton.qml +++ b/tests/manual/testbench/controls/RadioButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RadioDelegate.qml b/tests/manual/testbench/controls/RadioDelegate.qml index fcae84f7..e449744c 100644 --- a/tests/manual/testbench/controls/RadioDelegate.qml +++ b/tests/manual/testbench/controls/RadioDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RangeSlider.qml b/tests/manual/testbench/controls/RangeSlider.qml index debd097c..b3d84e53 100644 --- a/tests/manual/testbench/controls/RangeSlider.qml +++ b/tests/manual/testbench/controls/RangeSlider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/RoundButton.qml b/tests/manual/testbench/controls/RoundButton.qml index 6a2bb5c2..5d066133 100644 --- a/tests/manual/testbench/controls/RoundButton.qml +++ b/tests/manual/testbench/controls/RoundButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ScrollBar.qml b/tests/manual/testbench/controls/ScrollBar.qml index f59796d2..25c7f4d6 100644 --- a/tests/manual/testbench/controls/ScrollBar.qml +++ b/tests/manual/testbench/controls/ScrollBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ScrollIndicator.qml b/tests/manual/testbench/controls/ScrollIndicator.qml index 32c66aad..2c6fd4a9 100644 --- a/tests/manual/testbench/controls/ScrollIndicator.qml +++ b/tests/manual/testbench/controls/ScrollIndicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Slider.qml b/tests/manual/testbench/controls/Slider.qml index d2a272fa..831f4778 100644 --- a/tests/manual/testbench/controls/Slider.qml +++ b/tests/manual/testbench/controls/Slider.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/SpinBox.qml b/tests/manual/testbench/controls/SpinBox.qml index 77094dc0..0fdfb9fe 100644 --- a/tests/manual/testbench/controls/SpinBox.qml +++ b/tests/manual/testbench/controls/SpinBox.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/SwipeDelegate.qml b/tests/manual/testbench/controls/SwipeDelegate.qml index 6143a50f..141435d8 100644 --- a/tests/manual/testbench/controls/SwipeDelegate.qml +++ b/tests/manual/testbench/controls/SwipeDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Switch.qml b/tests/manual/testbench/controls/Switch.qml index 63051a50..6df1a0e0 100644 --- a/tests/manual/testbench/controls/Switch.qml +++ b/tests/manual/testbench/controls/Switch.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/SwitchDelegate.qml b/tests/manual/testbench/controls/SwitchDelegate.qml index 4cb42105..ac4a322a 100644 --- a/tests/manual/testbench/controls/SwitchDelegate.qml +++ b/tests/manual/testbench/controls/SwitchDelegate.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/TabBar.qml b/tests/manual/testbench/controls/TabBar.qml index 4e6440d3..7e98eb93 100644 --- a/tests/manual/testbench/controls/TabBar.qml +++ b/tests/manual/testbench/controls/TabBar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 // TODO QtObject { diff --git a/tests/manual/testbench/controls/TextArea.qml b/tests/manual/testbench/controls/TextArea.qml index 8f2493f4..ae3cf08b 100644 --- a/tests/manual/testbench/controls/TextArea.qml +++ b/tests/manual/testbench/controls/TextArea.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/TextField.qml b/tests/manual/testbench/controls/TextField.qml index 7ecd21b2..b9a5bfb8 100644 --- a/tests/manual/testbench/controls/TextField.qml +++ b/tests/manual/testbench/controls/TextField.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/ToolBar.qml b/tests/manual/testbench/controls/ToolBar.qml index 7ce40218..ec80ebe7 100644 --- a/tests/manual/testbench/controls/ToolBar.qml +++ b/tests/manual/testbench/controls/ToolBar.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 // TODO QtObject { diff --git a/tests/manual/testbench/controls/ToolTip.qml b/tests/manual/testbench/controls/ToolTip.qml index 19ae9dd1..3e3a017b 100644 --- a/tests/manual/testbench/controls/ToolTip.qml +++ b/tests/manual/testbench/controls/ToolTip.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/controls/Tumbler.qml b/tests/manual/testbench/controls/Tumbler.qml index 0d64ff3b..f10af24e 100644 --- a/tests/manual/testbench/controls/Tumbler.qml +++ b/tests/manual/testbench/controls/Tumbler.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 QtObject { property var supportedStates: [ diff --git a/tests/manual/testbench/testbench.qml b/tests/manual/testbench/testbench.qml index 5b051460..daef63b1 100644 --- a/tests/manual/testbench/testbench.qml +++ b/tests/manual/testbench/testbench.qml @@ -48,11 +48,11 @@ ** ****************************************************************************/ -import QtQuick 2.10 -import QtQuick.Window 2.3 -import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 -import QtQuick.Controls.Imagine 2.3 +import QtQuick 2.12 +import QtQuick.Window 2.12 +import QtQuick.Layouts 1.12 +import QtQuick.Controls 2.12 +import QtQuick.Controls.Imagine 2.12 import Qt.labs.folderlistmodel 2.2 import Qt.labs.settings 1.0 diff --git a/tests/manual/viewinqwidget/main.qml b/tests/manual/viewinqwidget/main.qml index 4e38104e..f383f022 100644 --- a/tests/manual/viewinqwidget/main.qml +++ b/tests/manual/viewinqwidget/main.qml @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.1 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { visible: true |