diff --git a/src/corelib/Qt6CoreDeploySupport.cmake b/src/corelib/Qt6CoreDeploySupport.cmake index d149796b212..2fbeb5e96f5 100644 --- a/src/corelib/Qt6CoreDeploySupport.cmake +++ b/src/corelib/Qt6CoreDeploySupport.cmake @@ -7,8 +7,6 @@ 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) set(no_value_options "") set(single_value_options @@ -277,8 +275,6 @@ function(_qt_internal_generic_deployqt) endif() endfunction() -# This function is currently in Technical Preview. -# Its signature and behavior might change. function(qt6_deploy_runtime_dependencies) if(NOT __QT_DEPLOY_TOOL) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 1c71a9546fd..bea1643ed42 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -2694,8 +2694,6 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) endmacro() endif() -# This function is currently in Technical Preview. -# Its signature and behavior might change. function(qt6_generate_deploy_script) set(no_value_options "") set(single_value_options @@ -2775,8 +2773,6 @@ if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) endmacro() endif() -# This function is currently in Technical Preview. -# Its signature and behavior might change. function(qt6_generate_deploy_app_script) # 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 diff --git a/src/corelib/doc/src/cmake/cmake-deploy-variables.qdoc b/src/corelib/doc/src/cmake/cmake-deploy-variables.qdoc index a84b9bca6ee..61826981a11 100644 --- a/src/corelib/doc/src/cmake/cmake-deploy-variables.qdoc +++ b/src/corelib/doc/src/cmake/cmake-deploy-variables.qdoc @@ -19,7 +19,6 @@ \include cmake-deploy-var-usage.qdocinc \cmakevariablesince 6.3 -\preliminarycmakevariable \c{QT_DEPLOY_PREFIX} provides the base deployment directory. The other \c{QT_DEPLOY_..._DIR} variables should be treated as relative to this location. @@ -64,7 +63,6 @@ variables. \include cmake-deploy-var-usage.qdocinc \cmakevariablesince 6.3 -\preliminarycmakevariable 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 @@ -105,7 +103,6 @@ should not be used for that scenario. \include cmake-deploy-var-usage.qdocinc \cmakevariablesince 6.3 -\preliminarycmakevariable 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 @@ -147,7 +144,6 @@ should not be used for that scenario. \include cmake-deploy-var-usage.qdocinc \cmakevariablesince 6.3 -\preliminarycmakevariable Projects should use \c QT_DEPLOY_PLUGINS_DIR in their deploy scripts to avoid hard-coding a particular directory under which to deploy plugins. @@ -183,7 +179,6 @@ bundle contents. \include cmake-deploy-var-usage.qdocinc \cmakevariablesince 6.3 -\preliminarycmakevariable 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. @@ -221,7 +216,6 @@ to be deployed to different locations within the app bundle. \include cmake-deploy-var-usage.qdocinc \cmakevariablesince 6.5 -\preliminarycmakevariable Projects should use \c QT_DEPLOY_TRANSLATIONS_DIR in their deploy scripts to 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 \cmakevariablesince 6.5 -\preliminarycmakevariable This variable contains a list of directories that are not taken into account when searching for runtime dependencies with \l{qt_deploy_runtime_dependencies}. diff --git a/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc b/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc index fb3ee4796ef..4c66ade5256 100644 --- a/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc +++ b/src/corelib/doc/src/cmake/qt_deploy_qt_conf.qdoc @@ -17,7 +17,6 @@ only be called from a deployment script. It cannot be called directly by the project. \cmakecommandsince 6.3 -\preliminarycmakecommand \note This command does not usually need to be called directly. It is used internally by other higher level commands, but projects wishing to implement more customized deployment logic may find it useful. diff --git a/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc b/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc index 7f6198d8042..798266da8b0 100644 --- a/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc +++ b/src/corelib/doc/src/cmake/qt_deploy_runtime_dependencies.qdoc @@ -17,7 +17,6 @@ can only be called from a deployment script. It cannot be called directly by the project during the configure stage. \cmakecommandsince 6.3 -\preliminarycmakecommand \note This command does not usually need to be called directly. It is used internally by other higher level commands, but projects wishing to implement more customized deployment logic may find it useful. diff --git a/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc b/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc index 6f6f96b8aed..a94f7af1032 100644 --- a/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc +++ b/src/corelib/doc/src/cmake/qt_generate_deploy_app_script.qdoc @@ -13,7 +13,6 @@ \include cmake-find-package-core.qdocinc \cmakecommandsince 6.3 -\preliminarycmakecommand \note This command is currently only supported on Windows and macOS. \section1 Synopsis diff --git a/src/corelib/doc/src/cmake/qt_generate_deploy_script.qdoc b/src/corelib/doc/src/cmake/qt_generate_deploy_script.qdoc index af0a6956d17..7aaaabc0070 100644 --- a/src/corelib/doc/src/cmake/qt_generate_deploy_script.qdoc +++ b/src/corelib/doc/src/cmake/qt_generate_deploy_script.qdoc @@ -13,7 +13,6 @@ \include cmake-find-package-core.qdocinc \cmakecommandsince 6.5 -\preliminarycmakecommand \section1 Synopsis