whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Clean up qt_generate_deploy_app_script for 6.3 

Mention in the docs that qt_generate_deploy_app_script does not
currently support cross-build scenarios.

Use the value of QT_DEPLOY_BIN_DIR instead of CMAKE_INSTALL_PREFIX
in the qt_deploy_runtime_dependencies call done by
qt6_generate_deploy_app_script. This matches what we say to do in the
documentation of qt_deploy_runtime_dependencies.

Pick-to: 6.3
Task-number: QTBUG-98545
Fixes: QTBUG-100921
Change-Id: Ie9bfddeaf503d3efe7a73b2e4148bbf0601d693e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
bb10
Alexandru Croitor 2022-02-17 15:03:21 +01:00
parent 95457ba8e7
commit 2305656a4e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/Qt6CoreMacros.cmake
View File

@ -2708,7 +2708,7 @@ qt_deploy_runtime_dependencies(
file(GENERATE OUTPUT "${file_name}" CONTENT "
include(${QT_DEPLOY_SUPPORT})
qt_deploy_runtime_dependencies(
EXECUTABLE ${CMAKE_INSTALL_BINDIR}/$<TARGET_FILE_NAME:${arg_TARGET}>
EXECUTABLE \${QT_DEPLOY_BIN_DIR}/$<TARGET_FILE_NAME:${arg_TARGET}>
GENERATE_QT_CONF
)")

9
src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc
View File

@ -71,9 +71,12 @@ which should come after the application's target has been installed using
\l{install(TARGETS)}.
The deployment script will call \l{qt_deploy_runtime_dependencies()} with a
suitable set of options for the standard install layout. This is currently only
implemented for macOS app bundles and Windows targets.
Calling \c{qt_generate_deploy_app_script()} for any other platform will result
suitable set of options for the standard install layout.
Currently, this is only implemented for macOS app bundles built on a macOS
host and Windows executables built on a Windows host.
Cross-building a Windows executable on a Linux host, as well as similar
scenarios, are not currently supported.
Calling \c{qt_generate_deploy_app_script()} in such a case will result
in a fatal error, unless the \c{NO_UNSUPPORTED_PLATFORM_ERROR} option is given.
For deploying a QML application, use