feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Introduce constant "firstQtWithAndroidDeployQt"

Browse Source 
Replace a couple of QVersionNumber(5, 4, 0) with it.

Change-Id: Iebc39a534500992c8eb4d72d34d71fe621b8c7c0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2024-03-21 16:08:42 +01:00
parent a2fa009b8b
commit 43f760cf3f
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -149,7 +149,7 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Id id)
m_uninstallPreviousPackage.setValue(false);
const QtSupport::QtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit());
const bool forced = qt && qt->qtVersion() < QVersionNumber(5, 4, 0);
const bool forced = qt && qt->qtVersion() < AndroidManager::firstQtWithAndroidDeployQt;
if (forced) {
m_uninstallPreviousPackage.setValue(true);
m_uninstallPreviousPackage.setEnabled(false);
@@ -277,7 +277,7 @@ bool AndroidDeployQtStep::init()
if (m_uninstallPreviousPackageRun)
m_manifestName = AndroidManager::manifestPath(target());
m_useAndroiddeployqt = version->qtVersion() >= QVersionNumber(5, 4, 0);
m_useAndroiddeployqt = version->qtVersion() >= AndroidManager::firstQtWithAndroidDeployQt;
if (m_useAndroiddeployqt) {
const QString buildKey = target()->activeBuildKey();
const ProjectNode *node = target()->project()->findNodeForBuildKey(buildKey);