1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix custom QT_DEPLOY_QML_DIR on Windows

Browse Source 
The value of QT_DEPLOY_QML_DIR was never passed to windeployqt.

Pick-to: 6.6 6.5
Fixes: QTBUG-121881
Change-Id: I993793f74d84ccb0e7c2deb72b1e33e81692ecbb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 527b9da5388a3cccb81706becbd8e40977d5db11)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2024-02-13 16:16:17 +01:00 committed by Qt Cherry-pick Bot
parent b04fe2de61
commit f224891038
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/Qt6CoreDeploySupport.cmake
View File

@ -428,6 +428,7 @@ function(qt6_deploy_runtime_dependencies)
--dir . --dir .
--libdir "${arg_BIN_DIR}" # NOTE: Deliberately not arg_LIB_DIR --libdir "${arg_BIN_DIR}" # NOTE: Deliberately not arg_LIB_DIR
--plugindir "${arg_PLUGINS_DIR}" --plugindir "${arg_PLUGINS_DIR}"
--qml-deploy-dir "${arg_QML_DIR}"
) )
if(NOT arg_NO_OVERWRITE) if(NOT arg_NO_OVERWRITE)
list(APPEND tool_options --force) list(APPEND tool_options --force)