diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-04-09 12:01:08 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-14 10:33:10 +0200 |
| commit | 27748dec471a9c9825f5a35d1936bb5d00400b5b (patch) | |
| tree | 17b04e1f802444d38fca27b466ebc334a5e11fc4 /src/imports/builtins/CMakeLists.txt | |
| parent | 400d176760de84626500787674b1ece387b25893 (diff) | |
CMake: Copy builtins.qmltypes to QML import path in non-prefix builds
Previously the file was copied to qtdeclarative/src/builtins due to
a missing QT_INSTALL_DIR.
Now it will be copied to qtbase_built/qml.
Change-Id: Icb392559c749b1a460763ac986269053d8050f0f
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/imports/builtins/CMakeLists.txt')
| -rw-r--r-- | src/imports/builtins/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/builtins/CMakeLists.txt b/src/imports/builtins/CMakeLists.txt index 93057d6605..00b6b07f0b 100644 --- a/src/imports/builtins/CMakeLists.txt +++ b/src/imports/builtins/CMakeLists.txt @@ -4,8 +4,9 @@ set(qml_type_file builtins.qmltypes) +qt_path_join(qml_install_dir "${QT_INSTALL_DIR}" "${INSTALL_QMLDIR}") qt_copy_or_install(FILES ${qml_type_file} - DESTINATION ${INSTALL_QMLDIR} + DESTINATION ${qml_install_dir} ) if (NOT CMAKE_CROSSCOMPILING) |