diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 18:27:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:22:59 +0000 |
| commit | 5e6bf7e22eb3734aa711e9dd885bc5c594f7db4c (patch) | |
| tree | fac78a35d68786be46b61b0c8d961f76bb0d4ab4 /src/imports/controls/material | |
| parent | 6f617349cf865ca3a7befc0dd472b7c2510fc431 (diff) | |
Regenerate projects to be in sync
Change-Id: I3a57449c9025e22414b8337fcffdeb0f4d769af2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/.prev_CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/imports/controls/material/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/imports/controls/material/.prev_CMakeLists.txt b/src/imports/controls/material/.prev_CMakeLists.txt index 3cf6d5d2..15fe3519 100644 --- a/src/imports/controls/material/.prev_CMakeLists.txt +++ b/src/imports/controls/material/.prev_CMakeLists.txt @@ -69,7 +69,7 @@ add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialsty # 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" @@ -130,10 +130,6 @@ set(qml_files "Tumbler.qml" ) -set_source_files_properties(${qml_files} PROPERTIES - QT_QML_SOURCE_INSTALL TRUE -) - qt6_target_qml_files(qtquickcontrols2materialstyleplugin FILES ${qml_files} diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index ae5ffe83..c6a2be63 100644 --- a/src/imports/controls/material/CMakeLists.txt +++ b/src/imports/controls/material/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickcontrols2materialstyleplugin Plugin: ##################################################################### -add_qml_module(qtquickcontrols2materialstyleplugin +qt_add_qml_module(qtquickcontrols2materialstyleplugin TARGET_PATH "QtQuick/Controls.2/Material" URI "QtQuick.Controls.Material" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" @@ -56,7 +56,7 @@ set(qtquickcontrols2materialstyleplugin_resource_files "shaders/RectangularGlow.frag" ) -add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" +qt_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" PREFIX "/qt-project.org/imports/QtQuick/Controls.2/Material" FILES @@ -69,7 +69,6 @@ add_qt_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialsty # 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 |