summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-24 09:34:19 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-02-20 08:36:59 +0000
commit1c7d264e3b2e9a2f0021786ea6967185f8282af0 (patch)
treeb375256b8b254037a195c8489fbf842bf925a9bd
parent1d4fa26a706a97c0c76a7de5cf6c98bb345dfbd7 (diff)
Use correct default install dir for qml fileswip/cmake
Change-Id: I26b89d0e172465de3df36ffb0b2ea92975e99a2a Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--src/qml/Qt6QmlMacros.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index a6e2e52bdb..869b8c507b 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -28,7 +28,7 @@
# right location. (OPTIONAL)
#
# INSTALL_LOCATION: Intended installation directory for this module. If no
-# value is supplied, the default installation path will be ${Qt6_DIR}/qml.
+# value is supplied, the default installation path will be ${INSTALL_QMLDIR}.
# (OPTIONAL).
#
# DO_NOT_INSTALL_METADATA: When present, will not install the supporting files.
@@ -157,7 +157,7 @@ function(qt6_add_qml_module target)
endif()
if (NOT arg_INSTALL_LOCATION)
- set(arg_INSTALL_LOCATION "${Qt6_DIR}/../../../qml/${arg_TARGET_PATH}")
+ set(arg_INSTALL_LOCATION "${INSTALL_QMLDIR}/${arg_TARGET_PATH}")
endif()
set_target_properties(${target}