diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2022-03-22 02:08:42 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2022-03-23 11:46:36 +0100 |
| commit | 82a9c92b50eff2ff16a71990a6822c8c09a6d235 (patch) | |
| tree | a742d6a6e345c09c87749064e965f0e393251078 | |
| parent | c760a9bad497af50d87c1030d53219abfac8b674 (diff) | |
| download | qtapplicationmanager-82a9c92b50eff2ff16a71990a6822c8c09a6d235.tar.gz | |
Always install the qmltypes, even for cross builds
Only the regeneration cannot be run in the cross build case.
Change-Id: I08d5faafbac6d7cd2b1ddbcf233c8f9a4dbbfd03
Fixes: QTBUG-99781
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>
(cherry picked from commit 3530d81e0b76d674e0e23890b787542bbbf73232)
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | src/tools/dumpqmltypes/CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/tools/dumpqmltypes/CMakeLists.txt b/src/tools/dumpqmltypes/CMakeLists.txt index f7997553..b76c763f 100644 --- a/src/tools/dumpqmltypes/CMakeLists.txt +++ b/src/tools/dumpqmltypes/CMakeLists.txt @@ -19,19 +19,19 @@ qt_internal_add_tool(${target_name} Qt::AppManWindowPrivate ) -if(TARGET ${target_name} AND NOT QT_FEATURE_cross_compile) - set(qml_install_dir "${INSTALL_QMLDIR}") - qt_path_join(qml_install_dir ${QT_INSTALL_DIR} ${qml_install_dir}) +set(qml_install_dir "${INSTALL_QMLDIR}") +qt_path_join(qml_install_dir ${QT_INSTALL_DIR} ${qml_install_dir}) - if(QT_WILL_INSTALL) - qt_install( - DIRECTORY "${CMAKE_SOURCE_DIR}/qmltypes/QtApplicationManager" - DESTINATION "${qml_install_dir}" - ) - else() - set(COPY_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/qmltypes" "${qml_install_dir}") - endif() +if(QT_WILL_INSTALL) + qt_install( + DIRECTORY "${CMAKE_SOURCE_DIR}/qmltypes/QtApplicationManager" + DESTINATION "${qml_install_dir}" + ) +else() + set(COPY_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/qmltypes" "${qml_install_dir}") +endif() +if(TARGET ${target_name} AND NOT QT_FEATURE_cross_compile) qt_internal_collect_command_environment(env_path env_plugin_path) # We have to set the env to get the PATH set to find the Qt libraries |