diff options
| author | Andrei Golubev <andrei.golubev@qt.io> | 2022-02-23 16:50:05 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-28 09:10:49 +0000 |
| commit | 7d87aa3d8ca1ed8fb231295a3480ff692d3729d1 (patch) | |
| tree | d00dada16e67452ff71c3536be01b0affd61691c | |
| parent | 2171d542acd8eea32962d1b24aef67d5df75a396 (diff) | |
Copy QML builtins in prefix builds
We need to do it "manually" since qt_copy_or_install only copies files
in non-prefix builds
Task-number: QTBUG-98011
Task-number: QTBUG-101163
Change-Id: Ie8e23fe15ad07054a15cc8f403079373382a5b83
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit c57ee418bf71120a2936bd8dd21ca5a9feb686d8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/imports/builtins/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/imports/builtins/CMakeLists.txt b/src/imports/builtins/CMakeLists.txt index fb6984a961..e1632e1b09 100644 --- a/src/imports/builtins/CMakeLists.txt +++ b/src/imports/builtins/CMakeLists.txt @@ -4,3 +4,10 @@ qt_path_join(qml_install_dir "${QT_INSTALL_DIR}" "${INSTALL_QMLDIR}") qt_copy_or_install(FILES ${qml_type_files} DESTINATION ${qml_install_dir} ) + +# in prefix builds we also need to copy the files into the build directory of +# the module, so that they are located together with the QML modules +if(QT_WILL_INSTALL) + qt_path_join(qml_build_dir "${QT_BUILD_DIR}" "${INSTALL_QMLDIR}") + file(COPY ${qml_type_files} DESTINATION ${qml_build_dir}) +endif() |