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

Doc: fix more links to cmake functions

Browse Source 
Use qt6_ consistently as the link target, and qt_ when referring to the
function.

Change-Id: I9bb903cd2c32dcded1ee7a2804aa36074e8a5c38
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
(cherry picked from commit 454dafb0e1a36ef6bbe9eafc240c22f6cd14e312)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2023-03-08 16:14:17 +01:00 committed by Qt Cherry-pick Bot
parent e64eaf57f3
commit 7a56f8b974
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
View File

@ -403,7 +403,7 @@ Enables verbose mode of the \l androiddeployqt deployment tool when it is called
internally at build time, usually during target finalization. internally at build time, usually during target finalization.
This variable also changes the default verbosity of install-time deployment This variable also changes the default verbosity of install-time deployment
scripts for other platforms (see \l{qt_deploy_runtime_dependencies()}), but it scripts for other platforms (see \l{qt6_deploy_runtime_dependencies()}), but it
must be set before the first \c{find_package(Qt6)} call to have that effect. must be set before the first \c{find_package(Qt6)} call to have that effect.
*/ */
@ -431,7 +431,8 @@ an application, along with its runtime dependencies:
\include cmake-deploy-runtime-dependencies.qdocinc \include cmake-deploy-runtime-dependencies.qdocinc
\sa qt_deploy_runtime_dependencies(), qt_deploy_qml_imports() \sa {qt6_deploy_runtime_dependencies}{qt_deploy_runtime_dependencies()},
{qt6_deploy_qml_imports}{qt_deploy_qml_imports()}
*/ */
/*! /*!

2
src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc
View File

@ -57,7 +57,7 @@ variables can be used to dynamically specify a path relative to the deployment b
as shown in the example below. This helps avoid hard-coding an absolute path. as shown in the example below. This helps avoid hard-coding an absolute path.
\sa {qt6_generate_deploy_app_script}{qt_generate_deploy_app_script()}, \sa {qt6_generate_deploy_app_script}{qt_generate_deploy_app_script()},
qt_deploy_runtime_dependencies() {qt6_deploy_runtime_dependencies}{qt_deploy_runtime_dependencies()}
\section1 Example \section1 Example

5
src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc
View File

@ -58,7 +58,7 @@ appropriate set of Qt plugins.
This command only considers runtime dependencies for which linking This command only considers runtime dependencies for which linking
relationships exist in the underlying binaries. It does not deploy QML modules, relationships exist in the underlying binaries. It does not deploy QML modules,
see \l{qt_deploy_qml_imports()} for that. see \l{qt6_deploy_qml_imports}{qt_deploy_qml_imports()} for that.
\section1 Arguments \section1 Arguments
@ -139,7 +139,8 @@ The default value of \c{POST_EXCLUDE_REGEXES} is constructed from the value of
\l{QT_DEPLOY_IGNORED_LIB_DIRS}. \l{QT_DEPLOY_IGNORED_LIB_DIRS}.
\sa {qt6_generate_deploy_app_script}{qt_generate_deploy_app_script()}, \sa {qt6_generate_deploy_app_script}{qt_generate_deploy_app_script()},
qt_deploy_qt_conf(), qt_deploy_qml_imports() {qt6_deploy_qt_conf}{qt_deploy_qt_conf()},
{qt6_deploy_qml_imports}{qt_deploy_qml_imports()}
\section1 Example \section1 Example

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

@ -52,9 +52,9 @@ generation time. It is intended to be used with the \l{install(SCRIPT)} command,
which should come after the application's target has been installed using which should come after the application's target has been installed using
\l{install(TARGETS)}. \l{install(TARGETS)}.
The deployment script will call \l{qt_deploy_runtime_dependencies()} with a The deployment script will call \l{qt6_deploy_runtime_dependencies}
suitable set of options for the standard install layout. {qt_deploy_runtime_dependencies()} with a suitable set of options for the standard
Currently, this is only implemented for install layout. Currently, this is only implemented for
\list \list
\li macOS app bundles built on a macOS host, \li macOS app bundles built on a macOS host,
\li Linux executables built on a Linux host, \li Linux executables built on a Linux host,
@ -81,7 +81,7 @@ The options \c{PRE_INCLUDE_REGEXES}, \c{PRE_EXCLUDE_REGEXES},
\c{POST_INCLUDE_REGEXES}, \c{POST_EXCLUDE_REGEXES}, \c{POST_INCLUDE_FILES}, and \c{POST_INCLUDE_REGEXES}, \c{POST_EXCLUDE_REGEXES}, \c{POST_INCLUDE_FILES}, and
\c{POST_EXCLUDE_FILES} can be specified to control the deployment of runtime \c{POST_EXCLUDE_FILES} can be specified to control the deployment of runtime
dependencies. These options do not apply to all platforms and are forwarded dependencies. These options do not apply to all platforms and are forwarded
unmodified to \l{qt_deploy_runtime_dependencies()}. unmodified to \l{qt6_deploy_runtime_dependencies}{qt_deploy_runtime_dependencies()}.
\sa {qt6_standard_project_setup}{qt_standard_project_setup()}, \sa {qt6_standard_project_setup}{qt_standard_project_setup()},
{qt6_generate_deploy_script}{qt_generate_deploy_script()}, {qt6_generate_deploy_script}{qt_generate_deploy_script()},