diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2021-09-03 08:11:32 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-03 15:10:44 +0000 |
| commit | da85503c98f120d3223b5d00860b107226a2736d (patch) | |
| tree | 57e08f222e1bef32337820b957943a1ab1fddc70 /src | |
| parent | 2fd57fa2d05e9779b4ed7b9a1f04ed706726092e (diff) | |
Make sure to install designer files with non-prefixed builds
It is not enough to just call qt_copy_or_install with a DESTINATION
value prefixed with only ${INSTALL_QMLDIR}/ because for non-prefixed
builds this will install relative to the directory this cmake file is
in. Instead we have to combine ${QT_INSTALL_DIR} with the target path to
make sure the final path is always correct. This pattern is used all
over, so we muse do it as well.
Change-Id: I571e19b42a611eaa1f368645e53114a99cb8fdaa
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit a5524a7544506e7915e9ab1d0ba3eaf687f401ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quickcontrols2/designer/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quickcontrols2/designer/CMakeLists.txt b/src/quickcontrols2/designer/CMakeLists.txt index 38d82acef6..a62461ed75 100644 --- a/src/quickcontrols2/designer/CMakeLists.txt +++ b/src/quickcontrols2/designer/CMakeLists.txt @@ -2,13 +2,13 @@ file(GLOB_RECURSE __aux_qml_glob_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*.png" ) - +qt_path_join(images_destination ${QT_INSTALL_DIR} "${INSTALL_QMLDIR}/QtQuick/Controls/designer/images") qt_copy_or_install( FILES ${__aux_qml_glob_files} - DESTINATION "${INSTALL_QMLDIR}/QtQuick/Controls/designer/images" + DESTINATION "${images_destination}" ) - +qt_path_join(destination ${QT_INSTALL_DIR} "${INSTALL_QMLDIR}/QtQuick/Controls/designer") qt_copy_or_install( FILES AbstractButtonSection.qml @@ -57,5 +57,5 @@ qt_copy_or_install( ToolSeparatorSpecifics.qml TumblerSpecifics.qml qtquickcontrols2.metainfo - DESTINATION "${INSTALL_QMLDIR}/QtQuick/Controls/designer" + DESTINATION "${destination}" ) |