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

CMake: Un-TP most of the deployment API

Browse Source 
They are deemed good enough.

qt_deploy_translations is left in TP because with the current
signature, it's not clear yet how it's supposed to work for iOS
and other non-desktop targets.

[ChangeLog][CMake] The Core CMake deployment API
is out of Technical Preview status.

Task-number: QTBUG-108507
Change-Id: I384233c697b33644de3c9e1fb17d04f44ca16ea2
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2022-12-07 15:43:01 +01:00
parent 146e22fff6
commit a873979eb9
7 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6CoreDeploySupport.cmake
View File

@ -7,8 +7,6 @@
cmake_minimum_required(VERSION 3.16...3.21) cmake_minimum_required(VERSION 3.16...3.21)
# This function is currently in Technical Preview.
# Its signature and behavior might change.
function(qt6_deploy_qt_conf qt_conf_absolute_path) function(qt6_deploy_qt_conf qt_conf_absolute_path)
set(no_value_options "") set(no_value_options "")
set(single_value_options set(single_value_options
@ -277,8 +275,6 @@ function(_qt_internal_generic_deployqt)
endif() endif()
endfunction() endfunction()
# This function is currently in Technical Preview.
# Its signature and behavior might change.
function(qt6_deploy_runtime_dependencies) function(qt6_deploy_runtime_dependencies)
if(NOT __QT_DEPLOY_TOOL) if(NOT __QT_DEPLOY_TOOL)

4
src/corelib/Qt6CoreMacros.cmake
View File

@ -2694,8 +2694,6 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
endmacro() endmacro()
endif() endif()
# This function is currently in Technical Preview.
# Its signature and behavior might change.
function(qt6_generate_deploy_script) function(qt6_generate_deploy_script)
set(no_value_options "") set(no_value_options "")
set(single_value_options set(single_value_options
@ -2775,8 +2773,6 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
endmacro() endmacro()
endif() endif()
# This function is currently in Technical Preview.
# Its signature and behavior might change.
function(qt6_generate_deploy_app_script) function(qt6_generate_deploy_app_script)
# We use a TARGET keyword option instead of taking the target as the first # We use a TARGET keyword option instead of taking the target as the first
# positional argument. This is to keep open the possibility of deploying # positional argument. This is to keep open the possibility of deploying

7
src/corelib/doc/src/cmake/cmake-deploy-variables.qdoc
View File

@ -19,7 +19,6 @@
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.3 \cmakevariablesince 6.3
\preliminarycmakevariable
\c{QT_DEPLOY_PREFIX} provides the base deployment directory. The other \c{QT_DEPLOY_PREFIX} provides the base deployment directory. The other
\c{QT_DEPLOY_..._DIR} variables should be treated as relative to this location. \c{QT_DEPLOY_..._DIR} variables should be treated as relative to this location.
@ -64,7 +63,6 @@ variables.
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.3 \cmakevariablesince 6.3
\preliminarycmakevariable
Projects should use \c QT_DEPLOY_BIN_DIR in their deploy scripts to avoid Projects should use \c QT_DEPLOY_BIN_DIR in their deploy scripts to avoid
hard-coding a particular directory in which to deploy the following types of hard-coding a particular directory in which to deploy the following types of
@ -105,7 +103,6 @@ should not be used for that scenario.
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.3 \cmakevariablesince 6.3
\preliminarycmakevariable
Projects should use \c QT_DEPLOY_LIB_DIR in their deploy scripts to avoid Projects should use \c QT_DEPLOY_LIB_DIR in their deploy scripts to avoid
hard-coding a particular directory in which to deploy the following types of hard-coding a particular directory in which to deploy the following types of
@ -147,7 +144,6 @@ should not be used for that scenario.
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.3 \cmakevariablesince 6.3
\preliminarycmakevariable
Projects should use \c QT_DEPLOY_PLUGINS_DIR in their deploy scripts to avoid Projects should use \c QT_DEPLOY_PLUGINS_DIR in their deploy scripts to avoid
hard-coding a particular directory under which to deploy plugins. hard-coding a particular directory under which to deploy plugins.
@ -183,7 +179,6 @@ bundle contents.
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.3 \cmakevariablesince 6.3
\preliminarycmakevariable
Projects should use \c QT_DEPLOY_QML_DIR in their deploy scripts to avoid Projects should use \c QT_DEPLOY_QML_DIR in their deploy scripts to avoid
hard-coding a particular directory under which to deploy QML modules. hard-coding a particular directory under which to deploy QML modules.
@ -221,7 +216,6 @@ to be deployed to different locations within the app bundle.
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.5 \cmakevariablesince 6.5
\preliminarycmakevariable
Projects should use \c QT_DEPLOY_TRANSLATIONS_DIR in their deploy scripts to Projects should use \c QT_DEPLOY_TRANSLATIONS_DIR in their deploy scripts to
avoid hard-coding a particular directory under which to deploy translations. avoid hard-coding a particular directory under which to deploy translations.
@ -254,7 +248,6 @@ This variable is not meaningful when deploying on macOS or Windows.
\include cmake-deploy-var-usage.qdocinc \include cmake-deploy-var-usage.qdocinc
\cmakevariablesince 6.5 \cmakevariablesince 6.5
\preliminarycmakevariable
This variable contains a list of directories that are not taken into account This variable contains a list of directories that are not taken into account
when searching for runtime dependencies with \l{qt_deploy_runtime_dependencies}. when searching for runtime dependencies with \l{qt_deploy_runtime_dependencies}.

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

@ -17,7 +17,6 @@ only be called from a deployment script. It cannot be called directly by the
project. project.
\cmakecommandsince 6.3 \cmakecommandsince 6.3
\preliminarycmakecommand
\note This command does not usually need to be called directly. It is used \note This command does not usually need to be called directly. It is used
internally by other higher level commands, but projects wishing to internally by other higher level commands, but projects wishing to
implement more customized deployment logic may find it useful. implement more customized deployment logic may find it useful.

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

@ -17,7 +17,6 @@ can only be called from a deployment script. It cannot be called directly by the
project during the configure stage. project during the configure stage.
\cmakecommandsince 6.3 \cmakecommandsince 6.3
\preliminarycmakecommand
\note This command does not usually need to be called directly. It is used \note This command does not usually need to be called directly. It is used
internally by other higher level commands, but projects wishing to internally by other higher level commands, but projects wishing to
implement more customized deployment logic may find it useful. implement more customized deployment logic may find it useful.

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

@ -13,7 +13,6 @@
\include cmake-find-package-core.qdocinc \include cmake-find-package-core.qdocinc
\cmakecommandsince 6.3 \cmakecommandsince 6.3
\preliminarycmakecommand
\note This command is currently only supported on Windows and macOS. \note This command is currently only supported on Windows and macOS.
\section1 Synopsis \section1 Synopsis

1
src/corelib/doc/src/cmake/qt_generate_deploy_script.qdoc
View File

@ -13,7 +13,6 @@
\include cmake-find-package-core.qdocinc \include cmake-find-package-core.qdocinc
\cmakecommandsince 6.5 \cmakecommandsince 6.5
\preliminarycmakecommand
\section1 Synopsis \section1 Synopsis