aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-02-26 15:28:45 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-03-01 22:27:28 +0000
commit8135d10c0f0dc29e219c598c22d0bf13ecb21cae (patch)
treed4b3de8494f82cfeae3e59152dde53538dbafef3
parent5e672d90008cf3d855ec561418d1596854677e03 (diff)
CMake: Remove INSTALL_QML_FILES option
QML files shall always be installed together with the module. Not installing them will just cause confusion. 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> (cherry picked from commit 814ab9d05e947843de5e5708fb644f98db4765bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/Qt6QmlBuildInternals.cmake8
-rw-r--r--src/qml/Qt6QmlMacros.cmake11
2 files changed, 1 insertions, 18 deletions
diff --git a/src/qml/Qt6QmlBuildInternals.cmake b/src/qml/Qt6QmlBuildInternals.cmake
index f6f1c98ecb..161c90644d 100644
--- a/src/qml/Qt6QmlBuildInternals.cmake
+++ b/src/qml/Qt6QmlBuildInternals.cmake
@@ -123,12 +123,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()
@@ -152,8 +146,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"
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index 2dfd02cbf6..65ebfd2477 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -35,9 +35,6 @@ set(__qt_qml_macros_module_base_dir "${CMAKE_CURRENT_LIST_DIR}")
#
# DO_NOT_INSTALL_METADATA: When present, will not install the supporting files.
#
-# INSTALL_QML_FILES: When present, will install the qml files along side the
-# plugin.
-#
# SOURCES: List of C++ sources. (OPTIONAL)
#
# DEPENDENCIES: List of QML Module dependencies and their versions. The module
@@ -99,7 +96,6 @@ function(qt6_add_qml_module target)
DO_NOT_INSTALL_METADATA
SKIP_TYPE_REGISTRATION
PLUGIN_OPTIONAL
- INSTALL_QML_FILES
PURE_MODULE
)
@@ -275,10 +271,6 @@ function(qt6_add_qml_module target)
endif()
endif()
- if (arg_INSTALL_QML_FILES)
- set_target_properties(${target} PROPERTIES QT_QML_MODULE_INSTALL_QML_FILES TRUE)
- endif()
-
if (arg_SKIP_TYPE_REGISTRATION)
set_target_properties(${target} PROPERTIES QT_QML_MODULE_SKIP_TYPE_REGISTRATION TRUE)
endif()
@@ -576,7 +568,6 @@ function(qt6_target_qml_files target)
cmake_parse_arguments(arg "" "" "FILES" ${ARGN})
get_target_property(resource_count ${target} QT6_QML_MODULE_ADD_QML_FILES_COUNT)
get_target_property(qmldir_file ${target} QT_QML_MODULE_QMLDIR_FILE)
- get_target_property(install_qml_files ${target} QT_QML_MODULE_INSTALL_QML_FILES)
if (NOT qmldir_file)
message(FATAL_ERROR "qt6_target_qml_file: ${target} is not a Qml module")
endif()
@@ -623,7 +614,7 @@ function(qt6_target_qml_files target)
if (NOT "${qml_file_dir}" STREQUAL "")
set(qml_file_dir "/${qml_file_dir}")
endif()
- if (install_qml_files AND qml_module_install_dir)
+ if (qml_module_install_dir)
if (NOT QT_WILL_INSTALL)
file(COPY "${qml_file}" DESTINATION "${qml_module_install_dir}${qml_file_dir}")
else()