diff options
Diffstat (limited to 'src/imports/controls/universal')
71 files changed, 753 insertions, 705 deletions
diff --git a/src/imports/controls/universal/.prev_CMakeLists.txt b/src/imports/controls/universal/.prev_CMakeLists.txt index f78b6e49..df0232e7 100644 --- a/src/imports/controls/universal/.prev_CMakeLists.txt +++ b/src/imports/controls/universal/.prev_CMakeLists.txt @@ -4,18 +4,14 @@ ## qtquickcontrols2universalstyleplugin Plugin: ##################################################################### -add_qml_module(qtquickcontrols2universalstyleplugin - TARGET_PATH "QtQuick/Controls.2/Universal" +qt_add_qml_module(qtquickcontrols2universalstyleplugin URI "QtQuick.Controls.Universal" - VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2UniversalStylePlugin - DEPENDENCIES - QtQuick.Controls/2.5 - SKIP_TYPE_REGISTRATION + IMPORTS + QtQuick.Controls.Default/auto + GENERATE_QMLTYPES SOURCES - qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h - qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h - qquickuniversalprogressbar.cpp qquickuniversalprogressbar_p.h qquickuniversalstyle.cpp qquickuniversalstyle_p.h qquickuniversaltheme.cpp qquickuniversaltheme_p.h qtquickcontrols2universalstyleplugin.cpp @@ -26,6 +22,7 @@ add_qml_module(qtquickcontrols2universalstyleplugin Qt::CorePrivate Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2ImplPrivate Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private @@ -56,19 +53,19 @@ set(qtquickcontrols2universalstyleplugin_resource_files "images/rightarrow@4x.png" ) -add_qt_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" +qt_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" PREFIX - "/qt-project.org/imports/QtQuick/Controls.2/Universal" + "/qt-project.org/imports/QtQuick/Controls/Universal" FILES ${qtquickcontrols2universalstyleplugin_resource_files} ) #### Keys ignored in scope 1:.:.:universal.pro:<TRUE>: -# IMPORT_NAME = "QtQuick.Controls.Universal" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" -# TARGETPATH = "QtQuick/Controls.2/Universal" +# QML_IMPORT_NAME = "QtQuick.Controls.Universal" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtQuick/Controls/Universal" # _REQUIREMENTS = "qtConfig(quickcontrols2-universal)" set(qml_files @@ -77,7 +74,6 @@ set(qml_files "Button.qml" "CheckBox.qml" "CheckDelegate.qml" - "CheckIndicator.qml" "ComboBox.qml" "DelayButton.qml" "Dial.qml" @@ -86,6 +82,7 @@ set(qml_files "Drawer.qml" "Frame.qml" "GroupBox.qml" + "HorizontalHeaderView.qml" "ItemDelegate.qml" "Label.qml" "Menu.qml" @@ -100,7 +97,6 @@ set(qml_files "ProgressBar.qml" "RadioButton.qml" "RadioDelegate.qml" - "RadioIndicator.qml" "RangeSlider.qml" "RoundButton.qml" "ScrollBar.qml" @@ -111,7 +107,6 @@ set(qml_files "StackView.qml" "SwipeDelegate.qml" "SwitchDelegate.qml" - "SwitchIndicator.qml" "Switch.qml" "TabBar.qml" "TabButton.qml" @@ -122,6 +117,154 @@ set(qml_files "ToolSeparator.qml" "ToolTip.qml" "Tumbler.qml" + "VerticalHeaderView.qml" +) +set_source_files_properties(ApplicationWindow.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(BusyIndicator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Button.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(CheckBox.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(CheckDelegate.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(ComboBox.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(DelayButton.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.2;6.0" +) +set_source_files_properties(Dial.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Dialog.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.1;6.0" +) +set_source_files_properties(DialogButtonBox.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.1;6.0" +) +set_source_files_properties(Drawer.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Frame.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(GroupBox.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(HorizontalHeaderView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.15;6.0" +) +set_source_files_properties(ItemDelegate.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Label.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Menu.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(MenuBar.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.3;6.0" +) +set_source_files_properties(MenuBarItem.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.3;6.0" +) +set_source_files_properties(MenuItem.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(MenuSeparator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.1;6.0" +) +set_source_files_properties(Page.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(PageIndicator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Pane.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Popup.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(ProgressBar.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(RadioButton.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(RadioDelegate.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(RangeSlider.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(RoundButton.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.1;6.0" +) +set_source_files_properties(ScrollBar.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(ScrollIndicator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Slider.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(SpinBox.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(SplitView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.13;6.0" +) +set_source_files_properties(StackView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(SwipeDelegate.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(SwitchDelegate.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Switch.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(TabBar.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(TabButton.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(TextArea.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(TextField.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(ToolBar.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(ToolButton.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(ToolSeparator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.1;6.0" +) +set_source_files_properties(ToolTip.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(Tumbler.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0;6.0" +) +set_source_files_properties(VerticalHeaderView.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.15;6.0" ) qt6_target_qml_files(qtquickcontrols2universalstyleplugin diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index 80cda477..2ec9c565 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick +import QtQuick.Window +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.ApplicationWindow { id: window diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index 2ad21b46..0bd3ca03 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.BusyIndicator { id: control diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index 657b2835..2f88fe60 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.Button { id: control diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt index cf0464f3..f97a92e9 100644 --- a/src/imports/controls/universal/CMakeLists.txt +++ b/src/imports/controls/universal/CMakeLists.txt @@ -5,17 +5,14 @@ ##################################################################### qt_add_qml_module(qtquickcontrols2universalstyleplugin - TARGET_PATH "QtQuick/Controls.2/Universal" + TARGET_PATH "QtQuick/Controls/Universal" URI "QtQuick.Controls.Universal" - VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "6.0" # special case CLASSNAME QtQuickControls2UniversalStylePlugin - DEPENDENCIES - QtQuick.Controls/2.5 - SKIP_TYPE_REGISTRATION + IMPORTS + QtQuick.Controls.Default/auto + GENERATE_QMLTYPES SOURCES - qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h - qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h - qquickuniversalprogressbar.cpp qquickuniversalprogressbar_p.h qquickuniversalstyle.cpp qquickuniversalstyle_p.h qquickuniversaltheme.cpp qquickuniversaltheme_p.h qtquickcontrols2universalstyleplugin.cpp @@ -26,6 +23,7 @@ qt_add_qml_module(qtquickcontrols2universalstyleplugin Qt::CorePrivate Qt::GuiPrivate Qt::QmlPrivate + Qt::QuickControls2ImplPrivate Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private @@ -58,17 +56,17 @@ set(qtquickcontrols2universalstyleplugin_resource_files qt_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin" PREFIX - "/qt-project.org/imports/QtQuick/Controls.2/Universal" + "/qt-project.org/imports/QtQuick/Controls/Universal" FILES ${qtquickcontrols2universalstyleplugin_resource_files} ) #### Keys ignored in scope 1:.:.:universal.pro:<TRUE>: -# IMPORT_NAME = "QtQuick.Controls.Universal" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" # OTHER_FILES = "qmldir" "$$QML_FILES" -# TARGETPATH = "QtQuick/Controls.2/Universal" +# QML_IMPORT_NAME = "QtQuick.Controls.Universal" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# TARGETPATH = "QtQuick/Controls/Universal" # _REQUIREMENTS = "qtConfig(quickcontrols2-universal)" set(qml_files @@ -77,7 +75,6 @@ set(qml_files "Button.qml" "CheckBox.qml" "CheckDelegate.qml" - "CheckIndicator.qml" "ComboBox.qml" "DelayButton.qml" "Dial.qml" @@ -101,7 +98,6 @@ set(qml_files "ProgressBar.qml" "RadioButton.qml" "RadioDelegate.qml" - "RadioIndicator.qml" "RangeSlider.qml" "RoundButton.qml" "ScrollBar.qml" @@ -112,7 +108,6 @@ set(qml_files "StackView.qml" "SwipeDelegate.qml" "SwitchDelegate.qml" - "SwitchIndicator.qml" "Switch.qml" "TabBar.qml" "TabButton.qml" @@ -126,160 +121,151 @@ set(qml_files "VerticalHeaderView.qml" ) set_source_files_properties(ApplicationWindow.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(BusyIndicator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Button.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(CheckBox.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(CheckDelegate.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE -) -set_source_files_properties(CheckIndicator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(ComboBox.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(DelayButton.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.2;6.0" ) set_source_files_properties(Dial.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Dialog.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.1;6.0" ) set_source_files_properties(DialogButtonBox.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.1;6.0" ) set_source_files_properties(Drawer.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Frame.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(GroupBox.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(HorizontalHeaderView.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.15;6.0" ) set_source_files_properties(ItemDelegate.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Label.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Menu.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(MenuBar.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.3;6.0" ) set_source_files_properties(MenuBarItem.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.3;6.0" ) set_source_files_properties(MenuItem.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(MenuSeparator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.1;6.0" ) set_source_files_properties(Page.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(PageIndicator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Pane.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Popup.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(ProgressBar.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(RadioButton.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(RadioDelegate.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE -) -set_source_files_properties(RadioIndicator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(RangeSlider.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(RoundButton.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.1;6.0" ) set_source_files_properties(ScrollBar.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(ScrollIndicator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Slider.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(SpinBox.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(SplitView.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.13;6.0" ) set_source_files_properties(StackView.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(SwipeDelegate.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(SwitchDelegate.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE -) -set_source_files_properties(SwitchIndicator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Switch.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(TabBar.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(TabButton.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(TextArea.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(TextField.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(ToolBar.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(ToolButton.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(ToolSeparator.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.1;6.0" ) set_source_files_properties(ToolTip.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(Tumbler.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.0;6.0" ) set_source_files_properties(VerticalHeaderView.qml PROPERTIES - QT_QML_SKIP_QMLDIR_ENTRY TRUE + QT_QML_SOURCE_VERSION "2.15;6.0" ) qt6_target_qml_files(qtquickcontrols2universalstyleplugin diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index 9494f4d2..ff35d372 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.CheckBox { id: control diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index b544c42e..13de8c57 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.CheckDelegate { id: control diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 9b88ccf9..1568d488 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.impl 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls.Universal 2.15 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ComboBox { id: control @@ -67,7 +67,7 @@ T.ComboBox { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/downarrow.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Universal/images/downarrow.png" Rectangle { z: -1 diff --git a/src/imports/controls/universal/DelayButton.qml b/src/imports/controls/universal/DelayButton.qml index 2a3a3b3a..5840fa86 100644 --- a/src/imports/controls/universal/DelayButton.qml +++ b/src/imports/controls/universal/DelayButton.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.DelayButton { id: control diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index 0d8fcba0..cd9e615e 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Dial { id: control diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index 6151d090..5bec0992 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Universal T.Dialog { id: control diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 0458c39d..1b1148e3 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.Universal T.DialogButtonBox { id: control diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index 7ec1d7f8..19f78f1e 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Drawer { id: control diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index 8bb44849..780ba734 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Frame { id: control diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index dc156dd7..5104b710 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.GroupBox { id: control diff --git a/src/imports/controls/universal/HorizontalHeaderView.qml b/src/imports/controls/universal/HorizontalHeaderView.qml index 47daa8ce..30bbbaaf 100644 --- a/src/imports/controls/universal/HorizontalHeaderView.qml +++ b/src/imports/controls/universal/HorizontalHeaderView.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.impl 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls.Universal 2.15 -import QtQuick.Controls.Universal.impl 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.HorizontalHeaderView { id: control diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index ed985405..694a896f 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.ItemDelegate { id: control diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml index c66435c3..9460c997 100644 --- a/src/imports/controls/universal/Label.qml +++ b/src/imports/controls/universal/Label.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Label { id: control diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 4814d006..080ea482 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Window 2.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Window T.Menu { id: control diff --git a/src/imports/controls/universal/MenuBar.qml b/src/imports/controls/universal/MenuBar.qml index 2317f505..f09083aa 100644 --- a/src/imports/controls/universal/MenuBar.qml +++ b/src/imports/controls/universal/MenuBar.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.MenuBar { id: control diff --git a/src/imports/controls/universal/MenuBarItem.qml b/src/imports/controls/universal/MenuBarItem.qml index 30f1fc57..eddc8090 100644 --- a/src/imports/controls/universal/MenuBarItem.qml +++ b/src/imports/controls/universal/MenuBarItem.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.MenuBarItem { id: control diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 23d0ee3c..cf6d12c9 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.MenuItem { id: control @@ -82,7 +82,7 @@ T.MenuItem { visible: control.subMenu mirror: control.mirrored color: !enabled ? control.Universal.baseLowColor : control.Universal.baseHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/rightarrow.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Universal/images/rightarrow.png" } indicator: ColorImage { @@ -91,7 +91,7 @@ T.MenuItem { visible: control.checked color: !control.enabled ? control.Universal.baseLowColor : control.down ? control.Universal.baseHighColor : control.Universal.baseMediumHighColor - source: !control.checkable ? "" : "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/checkmark.png" + source: !control.checkable ? "" : "qrc:/qt-project.org/imports/QtQuick/Controls/Universal/images/checkmark.png" } background: Rectangle { diff --git a/src/imports/controls/universal/MenuSeparator.qml b/src/imports/controls/universal/MenuSeparator.qml index 72f9f6f7..be6fad45 100644 --- a/src/imports/controls/universal/MenuSeparator.qml +++ b/src/imports/controls/universal/MenuSeparator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.MenuSeparator { id: control diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index 347d6d9a..8946e7ad 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Page { id: control diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index 3dcc84ab..2adb85c6 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.PageIndicator { id: control diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml index 63a5ecec..257f9caf 100644 --- a/src/imports/controls/universal/Pane.qml +++ b/src/imports/controls/universal/Pane.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Pane { id: control diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index e39134e1..5e972ea9 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Popup { id: control diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index ce79bd54..4f8cc874 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.ProgressBar { id: control diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index a50cdf9b..abd386ce 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.RadioButton { id: control diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 9fc910f3..e4656af9 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.RadioDelegate { id: control diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index f2e4d71e..5bdc4d8f 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.RangeSlider { id: control diff --git a/src/imports/controls/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 2eedf96e..f9538f99 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.RoundButton { id: control diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 8b8e325d..d101658c 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ScrollBar { id: control diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index ab66ee7c..f66a9658 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ScrollIndicator { id: control diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index 8f427b1e..37c77a35 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.Slider { id: control diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index dfe927f5..8f227190 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.SpinBox { id: control @@ -105,7 +105,7 @@ T.SpinBox { y: (parent.height - height) / 2 color: !enabled ? control.Universal.chromeDisabledLowColor : control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/" + (control.mirrored ? "left" : "right") + "arrow.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Universal/images/" + (control.mirrored ? "left" : "right") + "arrow.png" } } @@ -131,7 +131,7 @@ T.SpinBox { y: (parent.height - height) / 2 color: !enabled ? control.Universal.chromeDisabledLowColor : control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/" + (control.mirrored ? "right" : "left") + "arrow.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Universal/images/" + (control.mirrored ? "right" : "left") + "arrow.png" } } diff --git a/src/imports/controls/universal/SplitView.qml b/src/imports/controls/universal/SplitView.qml index a4ed22dd..e05d7235 100644 --- a/src/imports/controls/universal/SplitView.qml +++ b/src/imports/controls/universal/SplitView.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.13 -import QtQuick.Templates 2.13 as T -import QtQuick.Controls 2.13 -import QtQuick.Controls.impl 2.13 -import QtQuick.Controls.Universal 2.13 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.SplitView { id: control diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml index 5a3f7751..41611dd3 100644 --- a/src/imports/controls/universal/StackView.qml +++ b/src/imports/controls/universal/StackView.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.StackView { id: control diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 066049a7..10460bb8 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.SwipeDelegate { id: control diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 284b1229..33ee4abb 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls.Universal.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.Switch { id: control diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 56ba8494..79835808 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.SwitchDelegate { id: control diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml index c7d27cbd..9b98c10e 100644 --- a/src/imports/controls/universal/TabBar.qml +++ b/src/imports/controls/universal/TabBar.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.TabBar { id: control diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 66e3d725..a68162c7 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.TabButton { id: control diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 03ad4a89..5c4a5748 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.TextArea { id: control diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index ba5bf685..7f940983 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.TextField { id: control diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml index 5a385e8e..0266056f 100644 --- a/src/imports/controls/universal/ToolBar.qml +++ b/src/imports/controls/universal/ToolBar.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ToolBar { id: control diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index f36dac22..adde3dd0 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal T.ToolButton { id: control diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/imports/controls/universal/ToolSeparator.qml index ee8e6e1c..cd9be32d 100644 --- a/src/imports/controls/universal/ToolSeparator.qml +++ b/src/imports/controls/universal/ToolSeparator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ToolSeparator { id: control diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 431cdf7c..bf931a4c 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal T.ToolTip { id: control diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index ebbc746d..5dbe6d93 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls +import QtQuick.Controls.impl T.Tumbler { id: control diff --git a/src/imports/controls/universal/VerticalHeaderView.qml b/src/imports/controls/universal/VerticalHeaderView.qml index 04408d68..47eb8c95 100644 --- a/src/imports/controls/universal/VerticalHeaderView.qml +++ b/src/imports/controls/universal/VerticalHeaderView.qml @@ -34,12 +34,12 @@ ** ****************************************************************************/ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.impl 2.15 -import QtQuick.Templates 2.15 as T -import QtQuick.Controls.Universal 2.15 -import QtQuick.Controls.Universal.impl 2.15 +import QtQuick +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import QtQuick.Controls.Universal +import QtQuick.Controls.Universal.impl T.VerticalHeaderView { id: control diff --git a/src/imports/controls/universal/impl/CMakeLists.txt b/src/imports/controls/universal/impl/CMakeLists.txt new file mode 100644 index 00000000..6172b908 --- /dev/null +++ b/src/imports/controls/universal/impl/CMakeLists.txt @@ -0,0 +1,61 @@ +# Generated from universal-impl.pro. + +##################################################################### +## qtquickcontrols2universalstyleimplplugin Plugin: +##################################################################### + +qt_add_qml_module(qtquickcontrols2universalstyleimplplugin + URI "QtQuick.Controls.Universal.impl" + VERSION "${CMAKE_PROJECT_VERSION}" + CLASSNAME QtQuickControls2UniversalStyleImplPlugin + GENERATE_QMLTYPES + SOURCES + qquickuniversalbusyindicator.cpp qquickuniversalbusyindicator_p.h + qquickuniversalfocusrectangle.cpp qquickuniversalfocusrectangle_p.h + qquickuniversalprogressbar.cpp qquickuniversalprogressbar_p.h + qtquickcontrols2universalstyleimplplugin.cpp + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::QmlPrivate + Qt::QuickControls2ImplPrivate + Qt::QuickPrivate + Qt::QuickTemplates2Private + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui + Qt::Qml + Qt::Quick +) + +#### Keys ignored in scope 1:.:.:universal-impl.pro:<TRUE>: +# OTHER_FILES = "qmldir" "$$QML_FILES" +# QML_FILES = "$$PWD/CheckIndicator.qml" "$$PWD/RadioIndicator.qml" "$$PWD/SwitchIndicator.qml" +# QML_IMPORT_NAME = "QtQuick.Controls.Universal.impl" +# QML_IMPORT_VERSION = "$$QT_VERSION" +# QT_FOR_CONFIG = "quickcontrols2-private" +# TARGETPATH = "QtQuick/Controls/Universal/impl" +# _REQUIREMENTS = "qtConfig(quickcontrols2-universal)" + +set(qml_files + "CheckIndicator.qml" + "RadioIndicator.qml" + "SwitchIndicator.qml" +) +set_source_files_properties(CheckIndicator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0" +) +set_source_files_properties(RadioIndicator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0" +) +set_source_files_properties(SwitchIndicator.qml PROPERTIES + QT_QML_SOURCE_VERSION "2.0" +) + +qt6_target_qml_files(qtquickcontrols2universalstyleimplplugin + FILES + ${qml_files} +) diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/impl/CheckIndicator.qml index 8f41617a..5e56ca88 100644 --- a/src/imports/controls/universal/CheckIndicator.qml +++ b/src/imports/controls/universal/impl/CheckIndicator.qml @@ -34,11 +34,11 @@ ** ****************************************************************************/ -import QtQuick 2.12 -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 +import QtQuick.Templates as T +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Controls.Universal Rectangle { id: indicator @@ -62,7 +62,7 @@ Rectangle { visible: indicator.control.checkState === Qt.Checked color: !indicator.control.enabled ? indicator.control.Universal.baseLowColor : indicator.control.Universal.chromeWhiteColor - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Universal/images/checkmark.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Universal/images/checkmark.png" } Rectangle { diff --git a/src/imports/controls/universal/RadioIndicator.qml b/src/imports/controls/universal/impl/RadioIndicator.qml index 1a32decb..3cf1bf37 100644 --- a/src/imports/controls/universal/RadioIndicator.qml +++ b/src/imports/controls/universal/impl/RadioIndicator.qml @@ -34,8 +34,8 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Controls.Universal Rectangle { id: indicator diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/impl/SwitchIndicator.qml index 10f39515..aa455419 100644 --- a/src/imports/controls/universal/SwitchIndicator.qml +++ b/src/imports/controls/universal/impl/SwitchIndicator.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ -import QtQuick 2.12 -import QtQuick.Templates 2.12 as T -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Templates as T +import QtQuick.Controls.Universal Item { id: indicator diff --git a/src/imports/controls/universal/impl/qmldir b/src/imports/controls/universal/impl/qmldir new file mode 100644 index 00000000..5c39a4bb --- /dev/null +++ b/src/imports/controls/universal/impl/qmldir @@ -0,0 +1,7 @@ +module QtQuick.Controls.Universal.impl +plugin qtquickcontrols2universalstyleimplplugin +classname QtQuickControls2UniversalStyleImplPlugin + +CheckIndicator 2.0 CheckIndicator.qml +RadioIndicator 2.0 RadioIndicator.qml +SwitchIndicator 2.0 SwitchIndicator.qml diff --git a/src/imports/controls/universal/qquickuniversalbusyindicator.cpp b/src/imports/controls/universal/impl/qquickuniversalbusyindicator.cpp index 70170296..2f0ada49 100644 --- a/src/imports/controls/universal/qquickuniversalbusyindicator.cpp +++ b/src/imports/controls/universal/impl/qquickuniversalbusyindicator.cpp @@ -40,7 +40,7 @@ #include <QtCore/qeasingcurve.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qsgadaptationlayer_p.h> -#include <QtQuickControls2/private/qquickanimatednode_p.h> +#include <QtQuickControls2Impl/private/qquickanimatednode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/universal/qquickuniversalbusyindicator_p.h b/src/imports/controls/universal/impl/qquickuniversalbusyindicator_p.h index 119091b5..6d3ebb84 100644 --- a/src/imports/controls/universal/qquickuniversalbusyindicator_p.h +++ b/src/imports/controls/universal/impl/qquickuniversalbusyindicator_p.h @@ -58,6 +58,8 @@ class QQuickUniversalBusyIndicator : public QQuickItem Q_OBJECT Q_PROPERTY(int count READ count WRITE setCount FINAL) Q_PROPERTY(QColor color READ color WRITE setColor FINAL) + QML_NAMED_ELEMENT(BusyIndicatorImpl) + QML_ADDED_IN_VERSION(2, 0) public: explicit QQuickUniversalBusyIndicator(QQuickItem *parent = nullptr); diff --git a/src/imports/controls/universal/qquickuniversalfocusrectangle.cpp b/src/imports/controls/universal/impl/qquickuniversalfocusrectangle.cpp index 51508c6f..51508c6f 100644 --- a/src/imports/controls/universal/qquickuniversalfocusrectangle.cpp +++ b/src/imports/controls/universal/impl/qquickuniversalfocusrectangle.cpp diff --git a/src/imports/controls/universal/qquickuniversalfocusrectangle_p.h b/src/imports/controls/universal/impl/qquickuniversalfocusrectangle_p.h index 6bae3b13..f309b512 100644 --- a/src/imports/controls/universal/qquickuniversalfocusrectangle_p.h +++ b/src/imports/controls/universal/impl/qquickuniversalfocusrectangle_p.h @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE class QQuickUniversalFocusRectangle : public QQuickPaintedItem { Q_OBJECT + QML_NAMED_ELEMENT(FocusRectangle) + QML_ADDED_IN_VERSION(2, 0) public: QQuickUniversalFocusRectangle(QQuickItem *parent = nullptr); diff --git a/src/imports/controls/universal/qquickuniversalprogressbar.cpp b/src/imports/controls/universal/impl/qquickuniversalprogressbar.cpp index 7d4642c5..8f907b75 100644 --- a/src/imports/controls/universal/qquickuniversalprogressbar.cpp +++ b/src/imports/controls/universal/impl/qquickuniversalprogressbar.cpp @@ -41,7 +41,7 @@ #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qsgadaptationlayer_p.h> #include <QtQuick/qsgrectanglenode.h> -#include <QtQuickControls2/private/qquickanimatednode_p.h> +#include <QtQuickControls2Impl/private/qquickanimatednode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/universal/qquickuniversalprogressbar_p.h b/src/imports/controls/universal/impl/qquickuniversalprogressbar_p.h index 449f7965..31cb4a32 100644 --- a/src/imports/controls/universal/qquickuniversalprogressbar_p.h +++ b/src/imports/controls/universal/impl/qquickuniversalprogressbar_p.h @@ -59,6 +59,8 @@ class QQuickUniversalProgressBar : public QQuickItem Q_PROPERTY(QColor color READ color WRITE setColor FINAL) Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL) Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL) + QML_NAMED_ELEMENT(ProgressBarImpl) + QML_ADDED_IN_VERSION(2, 0) public: explicit QQuickUniversalProgressBar(QQuickItem *parent = nullptr); diff --git a/src/imports/controls/universal/impl/qtquickcontrols2universalstyleimplplugin.cpp b/src/imports/controls/universal/impl/qtquickcontrols2universalstyleimplplugin.cpp new file mode 100644 index 00000000..bc36be44 --- /dev/null +++ b/src/imports/controls/universal/impl/qtquickcontrols2universalstyleimplplugin.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2020 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module 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 <QtQml/qqmlextensionplugin.h> + +QT_BEGIN_NAMESPACE + +class QtQuickControls2UniversalStyleImplPlugin : public QQmlEngineExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) + +public: + QtQuickControls2UniversalStyleImplPlugin(QObject *parent = nullptr); +}; + +QtQuickControls2UniversalStyleImplPlugin::QtQuickControls2UniversalStyleImplPlugin(QObject *parent) + : QQmlEngineExtensionPlugin(parent) +{ +} + +QT_END_NAMESPACE + +#include "qtquickcontrols2universalstyleimplplugin.moc" diff --git a/src/imports/controls/universal/impl/universal-impl.pro b/src/imports/controls/universal/impl/universal-impl.pro new file mode 100644 index 00000000..dd4aab46 --- /dev/null +++ b/src/imports/controls/universal/impl/universal-impl.pro @@ -0,0 +1,36 @@ +TARGET = qtquickcontrols2universalstyleimplplugin +TARGETPATH = QtQuick/Controls/Universal/impl + +QML_IMPORT_NAME = QtQuick.Controls.Universal.impl +QML_IMPORT_VERSION = $$QT_VERSION + +QT += qml quick +QT_PRIVATE += core-private gui qml-private quick-private quicktemplates2-private quickcontrols2impl-private +QT_FOR_CONFIG = quickcontrols2-private + +DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII + +QML_FILES += \ + $$PWD/CheckIndicator.qml \ + $$PWD/RadioIndicator.qml \ + $$PWD/SwitchIndicator.qml + +OTHER_FILES += \ + qmldir \ + $$QML_FILES + +HEADERS += \ + $$PWD/qquickuniversalbusyindicator_p.h \ + $$PWD/qquickuniversalfocusrectangle_p.h \ + $$PWD/qquickuniversalprogressbar_p.h + +SOURCES += \ + $$PWD/qquickuniversalbusyindicator.cpp \ + $$PWD/qquickuniversalfocusrectangle.cpp \ + $$PWD/qquickuniversalprogressbar.cpp \ + $$PWD/qtquickcontrols2universalstyleimplplugin.cpp + +CONFIG += qmltypes install_qmltypes no_cxx_module install_qml_files builtin_resources qtquickcompiler +load(qml_plugin) + +requires(qtConfig(quickcontrols2-universal)) diff --git a/src/imports/controls/universal/plugins.qmltypes b/src/imports/controls/universal/plugins.qmltypes deleted file mode 100644 index c38e39e1..00000000 --- a/src/imports/controls/universal/plugins.qmltypes +++ /dev/null @@ -1,340 +0,0 @@ -import QtQuick.tooling 1.2 - -// This file describes the plugin-supplied types contained in the library. -// It is used for QML tooling purposes only. -// -// This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Universal 2.15' - -Module { - dependencies: ["QtQuick.Controls 2.0"] - Component { name: "QQuickAttachedObject"; prototype: "QObject" } - Component { - name: "QQuickItem" - defaultProperty: "data" - prototype: "QObject" - Enum { - name: "Flags" - values: { - "ItemClipsChildrenToShape": 1, - "ItemAcceptsInputMethod": 2, - "ItemIsFocusScope": 4, - "ItemHasContents": 8, - "ItemAcceptsDrops": 16 - } - } - Enum { - name: "TransformOrigin" - values: { - "TopLeft": 0, - "Top": 1, - "TopRight": 2, - "Left": 3, - "Center": 4, - "Right": 5, - "BottomLeft": 6, - "Bottom": 7, - "BottomRight": 8 - } - } - Property { name: "parent"; type: "QQuickItem"; isPointer: true } - Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true } - Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true } - Property { name: "x"; type: "double" } - Property { name: "y"; type: "double" } - Property { name: "z"; type: "double" } - Property { name: "width"; type: "double" } - Property { name: "height"; type: "double" } - Property { name: "opacity"; type: "double" } - Property { name: "enabled"; type: "bool" } - Property { name: "visible"; type: "bool" } - Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true } - Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true } - Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true } - Property { name: "state"; type: "string" } - Property { name: "childrenRect"; type: "QRectF"; isReadonly: true } - Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true } - Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true } - Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true } - Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true } - Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true } - Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true } - Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true } - Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true } - Property { name: "baselineOffset"; type: "double" } - Property { name: "clip"; type: "bool" } - Property { name: "focus"; type: "bool" } - Property { name: "activeFocus"; type: "bool"; isReadonly: true } - Property { name: "activeFocusOnTab"; revision: 1; type: "bool" } - Property { name: "rotation"; type: "double" } - Property { name: "scale"; type: "double" } - Property { name: "transformOrigin"; type: "TransformOrigin" } - Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true } - Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true } - Property { name: "smooth"; type: "bool" } - Property { name: "antialiasing"; type: "bool" } - Property { name: "implicitWidth"; type: "double" } - Property { name: "implicitHeight"; type: "double" } - Property { name: "containmentMask"; revision: 11; type: "QObject"; isPointer: true } - Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true } - Signal { - name: "childrenRectChanged" - Parameter { type: "QRectF" } - } - Signal { - name: "baselineOffsetChanged" - Parameter { type: "double" } - } - Signal { - name: "stateChanged" - Parameter { type: "string" } - } - Signal { - name: "focusChanged" - Parameter { type: "bool" } - } - Signal { - name: "activeFocusChanged" - Parameter { type: "bool" } - } - Signal { - name: "activeFocusOnTabChanged" - revision: 1 - Parameter { type: "bool" } - } - Signal { - name: "parentChanged" - Parameter { type: "QQuickItem"; isPointer: true } - } - Signal { - name: "transformOriginChanged" - Parameter { type: "TransformOrigin" } - } - Signal { - name: "smoothChanged" - Parameter { type: "bool" } - } - Signal { - name: "antialiasingChanged" - Parameter { type: "bool" } - } - Signal { - name: "clipChanged" - Parameter { type: "bool" } - } - Signal { - name: "windowChanged" - revision: 1 - Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } - } - Signal { name: "containmentMaskChanged"; revision: 11 } - Method { name: "update" } - Method { - name: "grabToImage" - revision: 4 - type: "bool" - Parameter { name: "callback"; type: "QJSValue" } - Parameter { name: "targetSize"; type: "QSize" } - } - Method { - name: "grabToImage" - revision: 4 - type: "bool" - Parameter { name: "callback"; type: "QJSValue" } - } - Method { - name: "contains" - type: "bool" - Parameter { name: "point"; type: "QPointF" } - } - Method { - name: "mapFromItem" - Parameter { type: "QQmlV4Function"; isPointer: true } - } - Method { - name: "mapToItem" - Parameter { type: "QQmlV4Function"; isPointer: true } - } - Method { - name: "mapFromGlobal" - revision: 7 - Parameter { type: "QQmlV4Function"; isPointer: true } - } - Method { - name: "mapToGlobal" - revision: 7 - Parameter { type: "QQmlV4Function"; isPointer: true } - } - Method { name: "forceActiveFocus" } - Method { - name: "forceActiveFocus" - Parameter { name: "reason"; type: "Qt::FocusReason" } - } - Method { - name: "nextItemInFocusChain" - revision: 1 - type: "QQuickItem*" - Parameter { name: "forward"; type: "bool" } - } - Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" } - Method { - name: "childAt" - type: "QQuickItem*" - Parameter { name: "x"; type: "double" } - Parameter { name: "y"; type: "double" } - } - } - Component { - name: "QQuickPaintedItem" - defaultProperty: "data" - prototype: "QQuickItem" - Enum { - name: "RenderTarget" - values: { - "Image": 0, - "FramebufferObject": 1, - "InvertedYFramebufferObject": 2 - } - } - Enum { - name: "PerformanceHints" - values: { - "FastFBOResizing": 1 - } - } - Property { name: "contentsSize"; type: "QSize" } - Property { name: "fillColor"; type: "QColor" } - Property { name: "contentsScale"; type: "double" } - Property { name: "renderTarget"; type: "RenderTarget" } - Property { name: "textureSize"; type: "QSize" } - } - Component { - name: "QQuickUniversalBusyIndicator" - defaultProperty: "data" - prototype: "QQuickItem" - exports: ["QtQuick.Controls.Universal.impl/BusyIndicatorImpl 2.0"] - exportMetaObjectRevisions: [0] - Property { name: "count"; type: "int" } - Property { name: "color"; type: "QColor" } - } - Component { - name: "QQuickUniversalFocusRectangle" - defaultProperty: "data" - prototype: "QQuickPaintedItem" - exports: ["QtQuick.Controls.Universal.impl/FocusRectangle 2.0"] - exportMetaObjectRevisions: [0] - } - Component { - name: "QQuickUniversalProgressBar" - defaultProperty: "data" - prototype: "QQuickItem" - exports: ["QtQuick.Controls.Universal.impl/ProgressBarImpl 2.0"] - exportMetaObjectRevisions: [0] - Property { name: "color"; type: "QColor" } - Property { name: "progress"; type: "double" } - Property { name: "indeterminate"; type: "bool" } - } - Component { - name: "QQuickUniversalStyle" - prototype: "QQuickAttachedObject" - exports: ["QtQuick.Controls.Universal/Universal 2.0"] - isCreatable: false - exportMetaObjectRevisions: [0] - Enum { - name: "Theme" - values: { - "Light": 0, - "Dark": 1, - "System": 2 - } - } - Enum { - name: "Color" - values: { - "Lime": 0, - "Green": 1, - "Emerald": 2, - "Teal": 3, - "Cyan": 4, - "Cobalt": 5, - "Indigo": 6, - "Violet": 7, - "Pink": 8, - "Magenta": 9, - "Crimson": 10, - "Red": 11, - "Orange": 12, - "Amber": 13, - "Yellow": 14, - "Brown": 15, - "Olive": 16, - "Steel": 17, - "Mauve": 18, - "Taupe": 19 - } - } - Property { name: "theme"; type: "Theme" } - Property { name: "accent"; type: "QVariant" } - Property { name: "foreground"; type: "QVariant" } - Property { name: "background"; type: "QVariant" } - Property { name: "altHighColor"; type: "QColor"; isReadonly: true } - Property { name: "altLowColor"; type: "QColor"; isReadonly: true } - Property { name: "altMediumColor"; type: "QColor"; isReadonly: true } - Property { name: "altMediumHighColor"; type: "QColor"; isReadonly: true } - Property { name: "altMediumLowColor"; type: "QColor"; isReadonly: true } - Property { name: "baseHighColor"; type: "QColor"; isReadonly: true } - Property { name: "baseLowColor"; type: "QColor"; isReadonly: true } - Property { name: "baseMediumColor"; type: "QColor"; isReadonly: true } - Property { name: "baseMediumHighColor"; type: "QColor"; isReadonly: true } - Property { name: "baseMediumLowColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeAltLowColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeBlackHighColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeBlackLowColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeBlackMediumLowColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeBlackMediumColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeDisabledHighColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeDisabledLowColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeHighColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeLowColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeMediumColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeMediumLowColor"; type: "QColor"; isReadonly: true } - Property { name: "chromeWhiteColor"; type: "QColor"; isReadonly: true } - Property { name: "listLowColor"; type: "QColor"; isReadonly: true } - Property { name: "listMediumColor"; type: "QColor"; isReadonly: true } - Signal { name: "paletteChanged" } - Method { - name: "color" - type: "QColor" - Parameter { name: "color"; type: "Color" } - } - } - Component { - prototype: "QQuickRectangle" - name: "QtQuick.Controls.Universal.impl/CheckIndicator 2.0" - exports: ["QtQuick.Controls.Universal.impl/CheckIndicator 2.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "control"; type: "QQuickItem"; isPointer: true } - Property { name: "partiallyChecked"; type: "bool"; isReadonly: true } - } - Component { - prototype: "QQuickRectangle" - name: "QtQuick.Controls.Universal.impl/RadioIndicator 2.0" - exports: ["QtQuick.Controls.Universal.impl/RadioIndicator 2.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "control"; type: "QVariant" } - } - Component { - prototype: "QQuickItem" - name: "QtQuick.Controls.Universal.impl/SwitchIndicator 2.0" - exports: ["QtQuick.Controls.Universal.impl/SwitchIndicator 2.0"] - exportMetaObjectRevisions: [0] - isComposite: true - defaultProperty: "data" - Property { name: "control"; type: "QQuickItem"; isPointer: true } - } -} diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir index 6870a4e1..5891244a 100644 --- a/src/imports/controls/universal/qmldir +++ b/src/imports/controls/universal/qmldir @@ -1,4 +1,116 @@ module QtQuick.Controls.Universal plugin qtquickcontrols2universalstyleplugin classname QtQuickControls2UniversalStylePlugin -depends QtQuick.Controls 2.5 +import QtQuick.Controls.Default auto + +# QtQuick.Controls 2.0 (originally introduced in Qt 5.7) +ApplicationWindow 2.0 ApplicationWindow.qml +BusyIndicator 2.0 BusyIndicator.qml +Button 2.0 Button.qml +CheckBox 2.0 CheckBox.qml +CheckDelegate 2.0 CheckDelegate.qml +ComboBox 2.0 ComboBox.qml +Dial 2.0 Dial.qml +Drawer 2.0 Drawer.qml +Frame 2.0 Frame.qml +GroupBox 2.0 GroupBox.qml +ItemDelegate 2.0 ItemDelegate.qml +Label 2.0 Label.qml +Menu 2.0 Menu.qml +MenuItem 2.0 MenuItem.qml +Page 2.0 Page.qml +PageIndicator 2.0 PageIndicator.qml +Pane 2.0 Pane.qml +Popup 2.0 Popup.qml +ProgressBar 2.0 ProgressBar.qml +RadioButton 2.0 RadioButton.qml +RadioDelegate 2.0 RadioDelegate.qml +RangeSlider 2.0 RangeSlider.qml +ScrollBar 2.0 ScrollBar.qml +ScrollIndicator 2.0 ScrollIndicator.qml +Slider 2.0 Slider.qml +SpinBox 2.0 SpinBox.qml +StackView 2.0 StackView.qml +SwipeDelegate 2.0 SwipeDelegate.qml +Switch 2.0 Switch.qml +SwitchDelegate 2.0 SwitchDelegate.qml +TabBar 2.0 TabBar.qml +TabButton 2.0 TabButton.qml +TextArea 2.0 TextArea.qml +TextField 2.0 TextField.qml +ToolBar 2.0 ToolBar.qml +ToolButton 2.0 ToolButton.qml +ToolTip 2.0 ToolTip.qml +Tumbler 2.0 Tumbler.qml + +# QtQuick.Controls 2.1 (new types in Qt 5.8) +Dialog 2.1 Dialog.qml +DialogButtonBox 2.1 DialogButtonBox.qml +MenuSeparator 2.1 MenuSeparator.qml +RoundButton 2.1 RoundButton.qml +ToolSeparator 2.1 ToolSeparator.qml + +# QtQuick.Controls 2.2 (new types in Qt 5.9) +DelayButton 2.2 DelayButton.qml + +# QtQuick.Controls 2.3 (new types in Qt 5.10) +MenuBar 2.3 MenuBar.qml +MenuBarItem 2.3 MenuBarItem.qml + +# QtQuick.Controls 2.13 (new types in Qt 5.13) +SplitView 2.13 SplitView.qml + +# QtQuick.Controls 2.15 (new types in Qt 5.15) +HorizontalHeaderView 2.15 HorizontalHeaderView.qml +VerticalHeaderView 2.15 VerticalHeaderView.qml + +# Make sure we have types registered for Qt 6: QTBUG-85774, QTBUG-85685 +ApplicationWindow 6.0 ApplicationWindow.qml +BusyIndicator 6.0 BusyIndicator.qml +Button 6.0 Button.qml +CheckBox 6.0 CheckBox.qml +CheckDelegate 6.0 CheckDelegate.qml +ComboBox 6.0 ComboBox.qml +DelayButton 6.0 DelayButton.qml +Dial 6.0 Dial.qml +Dialog 6.0 Dialog.qml +DialogButtonBox 6.0 DialogButtonBox.qml +Drawer 6.0 Drawer.qml +Frame 6.0 Frame.qml +GroupBox 6.0 GroupBox.qml +HorizontalHeaderView 6.0 HorizontalHeaderView.qml +ItemDelegate 6.0 ItemDelegate.qml +Label 6.0 Label.qml +Menu 6.0 Menu.qml +MenuBar 6.0 MenuBar.qml +MenuBarItem 6.0 MenuBarItem.qml +MenuItem 6.0 MenuItem.qml +MenuSeparator 6.0 MenuSeparator.qml +Page 6.0 Page.qml +PageIndicator 6.0 PageIndicator.qml +Pane 6.0 Pane.qml +Popup 6.0 Popup.qml +ProgressBar 6.0 ProgressBar.qml +RadioButton 6.0 RadioButton.qml +RadioDelegate 6.0 RadioDelegate.qml +RangeSlider 6.0 RangeSlider.qml +RoundButton 6.0 RoundButton.qml +ScrollBar 6.0 ScrollBar.qml +ScrollIndicator 6.0 ScrollIndicator.qml +Slider 6.0 Slider.qml +SpinBox 6.0 SpinBox.qml +SplitView 6.0 SplitView.qml +StackView 6.0 StackView.qml +SwipeDelegate 6.0 SwipeDelegate.qml +Switch 6.0 Switch.qml +SwitchDelegate 6.0 SwitchDelegate.qml +TabBar 6.0 TabBar.qml +TabButton 6.0 TabButton.qml +TextArea 6.0 TextArea.qml +TextField 6.0 TextField.qml +ToolBar 6.0 ToolBar.qml +ToolButton 6.0 ToolButton.qml +ToolSeparator 6.0 ToolSeparator.qml +ToolTip 6.0 ToolTip.qml +Tumbler 6.0 Tumbler.qml +VerticalHeaderView 6.0 VerticalHeaderView.qml diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h index 429621d7..50b07071 100644 --- a/src/imports/controls/universal/qquickuniversalstyle_p.h +++ b/src/imports/controls/universal/qquickuniversalstyle_p.h @@ -49,7 +49,7 @@ // #include <QtGui/qcolor.h> -#include <QtQuickControls2/private/qquickattachedobject_p.h> +#include <QtQuickControls2Impl/private/qquickattachedobject_p.h> QT_BEGIN_NAMESPACE @@ -88,6 +88,11 @@ class QQuickUniversalStyle : public QQuickAttachedObject Q_PROPERTY(QColor listLowColor READ listLowColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor listMediumColor READ listMediumColor NOTIFY paletteChanged FINAL) + QML_NAMED_ELEMENT(Universal) + QML_ATTACHED(QQuickUniversalStyle) + QML_UNCREATABLE("") + QML_ADDED_IN_VERSION(2, 0) + public: explicit QQuickUniversalStyle(QObject *parent = nullptr); diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp index 08cd5001..d6f7746d 100644 --- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp +++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp @@ -34,17 +34,15 @@ ** ****************************************************************************/ -#include <QtQuickControls2/private/qquickstyleplugin_p.h> - -#include "qquickuniversalbusyindicator_p.h" -#include "qquickuniversalfocusrectangle_p.h" -#include "qquickuniversalprogressbar_p.h" #include "qquickuniversalstyle_p.h" #include "qquickuniversaltheme_p.h" +#include <QtQuickControls2/private/qquickstyleplugin_p.h> +#include <QtQuickTemplates2/private/qquicktheme_p.h> + QT_BEGIN_NAMESPACE -class QtQuickControls2UniversalStylePlugin: public QQuickStylePlugin +class QtQuickControls2UniversalStylePlugin : public QQuickStylePlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) @@ -52,32 +50,15 @@ class QtQuickControls2UniversalStylePlugin: public QQuickStylePlugin public: QtQuickControls2UniversalStylePlugin(QObject *parent = nullptr); + QString name() const override; + void registerTypes(const char *uri) override; - QString name() const override; - void initializeTheme(QQuickTheme *theme) override; + QQuickUniversalTheme theme; }; QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObject *parent) : QQuickStylePlugin(parent) { - QQuickUniversalStyle::initGlobals(); -} - -void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri) -{ - qmlRegisterModule(uri, 2, 15); // 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, 15); // Qt 5.12->2.12, 5.13->2.13... - - qmlRegisterType<QQuickUniversalFocusRectangle>(import, 2, 0, "FocusRectangle"); - qmlRegisterType<QQuickUniversalBusyIndicator>(import, 2, 0, "BusyIndicatorImpl"); - qmlRegisterType<QQuickUniversalProgressBar>(import, 2, 0, "ProgressBarImpl"); - - qmlRegisterType(resolvedUrl(QStringLiteral("CheckIndicator.qml")), import, 2, 0, "CheckIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("RadioIndicator.qml")), import, 2, 0, "RadioIndicator"); - qmlRegisterType(resolvedUrl(QStringLiteral("SwitchIndicator.qml")), import, 2, 0, "SwitchIndicator"); } QString QtQuickControls2UniversalStylePlugin::name() const @@ -85,9 +66,12 @@ QString QtQuickControls2UniversalStylePlugin::name() const return QStringLiteral("Universal"); } -void QtQuickControls2UniversalStylePlugin::initializeTheme(QQuickTheme *theme) +void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri) { - QQuickUniversalTheme::initialize(theme); + QQuickStylePlugin::registerTypes(uri); + + QQuickUniversalStyle::initGlobals(); + theme.initialize(QQuickTheme::instance()); } QT_END_NAMESPACE diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.qrc b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.qrc index cd9ea61f..bfcb0974 100644 --- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.qrc +++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.qrc @@ -1,5 +1,5 @@ <!DOCTYPE RCC><RCC version="1.0"> -<qresource prefix="qt-project.org/imports/QtQuick/Controls.2/Universal"> +<qresource prefix="qt-project.org/imports/QtQuick/Controls/Universal"> <file>images/checkmark.png</file> <file>images/checkmark@2x.png</file> <file>images/checkmark@3x.png</file> diff --git a/src/imports/controls/universal/universal.pri b/src/imports/controls/universal/universal.pri index 8f1b905c..983fcf10 100644 --- a/src/imports/controls/universal/universal.pri +++ b/src/imports/controls/universal/universal.pri @@ -1,10 +1,17 @@ +HEADERS += \ + $$PWD/qquickuniversalstyle_p.h \ + $$PWD/qquickuniversaltheme_p.h + +SOURCES += \ + $$PWD/qquickuniversalstyle.cpp \ + $$PWD/qquickuniversaltheme.cpp + QML_FILES += \ $$PWD/ApplicationWindow.qml \ $$PWD/BusyIndicator.qml \ $$PWD/Button.qml \ $$PWD/CheckBox.qml \ $$PWD/CheckDelegate.qml \ - $$PWD/CheckIndicator.qml \ $$PWD/ComboBox.qml \ $$PWD/DelayButton.qml \ $$PWD/Dial.qml \ @@ -28,7 +35,6 @@ QML_FILES += \ $$PWD/ProgressBar.qml \ $$PWD/RadioButton.qml \ $$PWD/RadioDelegate.qml \ - $$PWD/RadioIndicator.qml \ $$PWD/RangeSlider.qml \ $$PWD/RoundButton.qml \ $$PWD/ScrollBar.qml \ @@ -39,7 +45,6 @@ QML_FILES += \ $$PWD/StackView.qml \ $$PWD/SwipeDelegate.qml \ $$PWD/SwitchDelegate.qml \ - $$PWD/SwitchIndicator.qml \ $$PWD/Switch.qml \ $$PWD/TabBar.qml \ $$PWD/TabButton.qml \ @@ -51,17 +56,3 @@ QML_FILES += \ $$PWD/ToolTip.qml \ $$PWD/Tumbler.qml \ $$PWD/VerticalHeaderView.qml - -HEADERS += \ - $$PWD/qquickuniversalbusyindicator_p.h \ - $$PWD/qquickuniversalfocusrectangle_p.h \ - $$PWD/qquickuniversalprogressbar_p.h \ - $$PWD/qquickuniversalstyle_p.h \ - $$PWD/qquickuniversaltheme_p.h - -SOURCES += \ - $$PWD/qquickuniversalbusyindicator.cpp \ - $$PWD/qquickuniversalfocusrectangle.cpp \ - $$PWD/qquickuniversalprogressbar.cpp \ - $$PWD/qquickuniversalstyle.cpp \ - $$PWD/qquickuniversaltheme.cpp diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index 99bad4da..a8b98fa7 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -1,11 +1,11 @@ TARGET = qtquickcontrols2universalstyleplugin -TARGETPATH = QtQuick/Controls.2/Universal +TARGETPATH = QtQuick/Controls/Universal -IMPORT_NAME = QtQuick.Controls.Universal -IMPORT_VERSION = 2.$$QT_MINOR_VERSION +QML_IMPORT_NAME = QtQuick.Controls.Universal +QML_IMPORT_VERSION = $$QT_VERSION QT += qml quick -QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private +QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private quickcontrols2impl-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII @@ -21,7 +21,7 @@ SOURCES += \ RESOURCES += \ $$PWD/qtquickcontrols2universalstyleplugin.qrc -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler +CONFIG += qmltypes no_cxx_module install_qml_files builtin_resources qtquickcompiler load(qml_plugin) requires(qtConfig(quickcontrols2-universal)) |