diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-06-27 14:43:41 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-28 00:49:21 +0000 |
| commit | 1f65a840bf729a83adfbdf8ec72139365cc4ff00 (patch) | |
| tree | 5ea2f02ae8e00a2814554f95abb45baaf0f6fbfb | |
| parent | c6b6d9332563bf690eb02220709c1c5918d58923 (diff) | |
Install qmltypes.prf for the cross-compiled builds
qmltypes.prf needs to be present in 'target' Qt builds too. Otherwise
qmake unable to resolve the 'qmltypes' CONFIG.
Fixes: QTBUG-102762
Change-Id: I4954509e09df41e9e86e752bd64593fc3f895128
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit cb94d6c9971c196b1e306a1691d69e7338ccda26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qmltyperegistrar/CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt index 38fa1c67cc..1146c9dfc3 100644 --- a/src/qmltyperegistrar/CMakeLists.txt +++ b/src/qmltyperegistrar/CMakeLists.txt @@ -23,6 +23,14 @@ qt_internal_add_tool(${target_name} PUBLIC_LIBRARIES Qt::CorePrivate ) + +# Install public prf files. +set(qmltyperegistrar_mkspecs "${CMAKE_CURRENT_SOURCE_DIR}/qmltypes.prf") +set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}") +qt_path_join(mkspecs_install_dir "${QT_INSTALL_DIR}" "${mkspecs_install_dir}" "features") +qt_copy_or_install(FILES "${qmltyperegistrar_mkspecs}" + DESTINATION ${mkspecs_install_dir}) + qt_internal_return_unless_building_tools() #### Keys ignored in scope 1:.:.:qmltyperegistrar.pro:<TRUE>: @@ -42,12 +50,3 @@ qt_internal_return_unless_building_tools() #### Keys ignored in scope 3:.:.:qmltyperegistrar.pro:else: # COPIES = "build_integration" - -# special case begin -# Install public prf files. -set(qmltyperegistrar_mkspecs "${CMAKE_CURRENT_SOURCE_DIR}/qmltypes.prf") -set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}") -qt_path_join(mkspecs_install_dir "${QT_INSTALL_DIR}" "${mkspecs_install_dir}" "features") -qt_copy_or_install(FILES "${qmltyperegistrar_mkspecs}" - DESTINATION ${mkspecs_install_dir}) -# special case end |