diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-26 15:28:45 +0100 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-03-02 05:57:44 +1100 |
| commit | 814ab9d05e947843de5e5708fb644f98db4765bd (patch) | |
| tree | 79ea3a9b2885dbe64ed8fc1f3078bcfa593d1a83 /src/qml/Qt6QmlBuildInternals.cmake | |
| parent | 09ae67f6270adcb69c06ce77d78b4cba2f1e447e (diff) | |
CMake: Remove INSTALL_QML_FILES option
QML files shall always be installed together with the module. Not
installing them will just cause confusion.
Pick-to: 6.1
Change-Id: I380b03f1cfce92f2c1fd1e0205e0fa307b385097
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/Qt6QmlBuildInternals.cmake')
| -rw-r--r-- | src/qml/Qt6QmlBuildInternals.cmake | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake index eaa8d05bd8..c2d8259bc0 100644 --- a/src/qml/Qt6QmlBuildInternals.cmake +++ b/src/qml/Qt6QmlBuildInternals.cmake @@ -125,12 +125,6 @@ function(qt_internal_add_qml_module target) qt_path_join(qml_module_install_dir ${QT_INSTALL_DIR} "${INSTALL_QMLDIR}/${arg_TARGET_PATH}") - set(qml_module_build_dir "") - if(NOT QT_WILL_INSTALL) - qt_path_join(qml_module_build_dir ${QT_INSTALL_DIR} "${INSTALL_QMLDIR}/${arg_TARGET_PATH}") - set(qml_module_build_dir OUTPUT_DIRECTORY "${qml_module_build_dir}") - endif() - if (arg_SOURCES AND NOT arg_TYPEINFO) set(arg_TYPEINFO "plugins.qmltypes") endif() @@ -154,8 +148,6 @@ function(qt_internal_add_qml_module target) OPTIONAL_IMPORTS "${arg_OPTIONAL_IMPORTS}" TYPEINFO "${arg_TYPEINFO}" DO_NOT_INSTALL_METADATA - INSTALL_QML_FILES - ${qml_module_build_dir} INSTALL_LOCATION "${qml_module_install_dir}" DEPENDENCIES ${arg_DEPENDENCIES} RESOURCE_EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets" |