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

Remove QT_ANDROID_DEPLOY_RELEASE variable

Browse Source 
We assume that we can remove the variable handling and replace with the
warning, since variable was never out from TP.

Task-number: QTBUG-121706
Change-Id: Iee29c0b5327d62cd3d7e77419e14e555fadcec2c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bb68cc5844b364987b4f8317ba2d4509b9253cf1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2024-01-31 15:48:12 +01:00 committed by Qt Cherry-pick Bot
parent bc60c5183d
commit 7369e8b7c1
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/Qt6AndroidMacros.cmake
View File

@ -469,8 +469,9 @@ function(qt6_android_add_apk_target target)
list(APPEND extra_args "--verbose") list(APPEND extra_args "--verbose")
endif() endif()
if(QT_ANDROID_DEPLOY_RELEASE) # legacy opt-in variable if(QT_ANDROID_DEPLOY_RELEASE)
set(QT_ANDROID_DEPLOYMENT_TYPE "RELEASE") message(WARNING "QT_ANDROID_DEPLOY_RELEASE is not a valid Qt variable."
" Please set QT_ANDROID_DEPLOYMENT_TYPE to RELEASE instead.")
endif() endif()
# Setting QT_ANDROID_DEPLOYMENT_TYPE to a value other than Release disables # Setting QT_ANDROID_DEPLOYMENT_TYPE to a value other than Release disables
# release package signing regardless of the build type. # release package signing regardless of the build type.

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

@ -80,28 +80,6 @@ is written out as part of the deployment settings for a target.
\sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()} \sa{qt6_android_generate_deployment_settings}{qt_android_generate_deployment_settings()}
*/ */
/*!
\page cmake-variable-qt-android-deploy-release.html
\ingroup cmake-variables-qtcore
\ingroup cmake-android-build-properties
\title QT_ANDROID_DEPLOY_RELEASE
\target cmake-variable-QT_ANDROID_DEPLOY_RELEASE
\summary {Forces release package signing regardless of the build type.}
\cmakevariablesince 6.5.2
\preliminarycmakevariable
\cmakevariableandroidonly
When set to \c TRUE, the \c --release flag is passed to the \c androiddeployqt
tool, even when the application build mode is Debug. In Release and
RelWithDebInfo builds this is the default. For more control over this, prefer
using \l QT_ANDROID_DEPLOYMENT_TYPE instead.
\sa {androiddeployqt}
*/
/*! /*!
\page cmake-variable-qt-android-deployment-type.html \page cmake-variable-qt-android-deployment-type.html
\ingroup cmake-variables-qtcore \ingroup cmake-variables-qtcore