diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-09-24 13:25:15 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-08 14:17:14 +0000 |
| commit | 2d4f2f1f4a4ff2f6e6189d9206875927d529f4c2 (patch) | |
| tree | 2de4d49455544b28ff43fd95d4690474521111fb /src/imports/controls/material/CMakeLists.txt | |
| parent | fa53bd50f15b5b213ed205ccc0a6f5dd21471222 (diff) | |
Update QtQuickControls2 project files
Re-run pro2cmake on all the project files.
Change-Id: I8d349cf34d6cc8e26c76193d9ef220fa85b16bb8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/imports/controls/material/CMakeLists.txt')
| -rw-r--r-- | src/imports/controls/material/CMakeLists.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index c1c964b2..ae5ffe83 100644 --- a/src/imports/controls/material/CMakeLists.txt +++ b/src/imports/controls/material/CMakeLists.txt @@ -5,10 +5,13 @@ ##################################################################### add_qml_module(qtquickcontrols2materialstyleplugin - CPP_PLUGIN TARGET_PATH "QtQuick/Controls.2/Material" URI "QtQuick.Controls.Material" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" + CLASSNAME QtQuickControls2MaterialStylePlugin + DEPENDENCIES + QtQuick.Controls/2.5 + SKIP_TYPE_REGISTRATION SOURCES qquickmaterialbusyindicator.cpp qquickmaterialbusyindicator_p.h qquickmaterialprogressbar.cpp qquickmaterialprogressbar_p.h @@ -61,6 +64,14 @@ add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialsty ) +#### Keys ignored in scope 1:.:.:material.pro:<TRUE>: +# IMPORT_NAME = "QtQuick.Controls.Material" +# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" +# OTHER_FILES = "qmldir" "$$QML_FILES" +# TARGETPATH = "QtQuick/Controls.2/Material" +# _LOADED = "qml_plugin" +# _REQUIREMENTS = "qtConfig(quickcontrols2-material)" + set(qml_files "ApplicationWindow.qml" "BoxShadow.qml" @@ -120,18 +131,7 @@ set(qml_files "Tumbler.qml" ) -add_qt_resource(qtquickcontrols2materialstyleplugin qmake_QtQuick_Controls_2_Material +qt6_target_qml_files(qtquickcontrols2materialstyleplugin FILES ${qml_files} ) - -qt_install_qml_files(qtquickcontrols2materialstyleplugin - FILES ${qml_files} -) - - -#### Keys ignored in scope 1:.:.:material.pro:<TRUE>: -# IMPORT_NAME = "QtQuick.Controls.Material" -# IMPORT_VERSION = "2.$$QT_MINOR_VERSION" -# OTHER_FILES = "qmldir" "$$QML_FILES" -# _LOADED = "qml_plugin" |