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

Revert "Android: Use direct member for aspect"

Browse Source 
This reverts commit ffd0f7306b.

Reason for revert: Breaks build. Revert is temporary, will be reapplied
after I6eefe739b3aebcef1ece196ff8d70aa36738997b is in

Change-Id: I5029f710656fb89eeaf65b55742678938f249aeb
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2023-05-23 10:22:30 +00:00
parent b4185f04aa
commit 48792c07a5
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ private:
QMap<QString, FilePath> m_filesToPull; QMap<QString, FilePath> m_filesToPull;
QStringList m_androidABIs; QStringList m_androidABIs;
BoolAspect m_uninstallPreviousPackage{this}; BoolAspect *m_uninstallPreviousPackage = nullptr;
bool m_uninstallPreviousPackageRun = false; bool m_uninstallPreviousPackageRun = false;
bool m_useAndroiddeployqt = false; bool m_useAndroiddeployqt = false;
bool m_askForUninstall = false; bool m_askForUninstall = false;
@@ -142,18 +142,18 @@ AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Id id)
{ {
setImmutable(true); setImmutable(true);
setUserExpanded(true); setUserExpanded(true);
setOwnsSubAspects(false);
m_uninstallPreviousPackage.setSettingsKey(UninstallPreviousPackageKey); m_uninstallPreviousPackage = addAspect<BoolAspect>();
m_uninstallPreviousPackage.setLabel(Tr::tr("Uninstall the existing app before deployment"), m_uninstallPreviousPackage->setSettingsKey(UninstallPreviousPackageKey);
BoolAspect::LabelPlacement::AtCheckBox); m_uninstallPreviousPackage->setLabel(Tr::tr("Uninstall the existing app before deployment"),
m_uninstallPreviousPackage.setValue(false); BoolAspect::LabelPlacement::AtCheckBox);
m_uninstallPreviousPackage->setValue(false);
const QtSupport::QtVersion * const qt = QtSupport::QtKitAspect::qtVersion(kit()); 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() < QVersionNumber(5, 4, 0);
if (forced) { if (forced) {
m_uninstallPreviousPackage.setValue(true); m_uninstallPreviousPackage->setValue(true);
m_uninstallPreviousPackage.setEnabled(false); m_uninstallPreviousPackage->setEnabled(false);
} }
connect(this, &AndroidDeployQtStep::askForUninstall, connect(this, &AndroidDeployQtStep::askForUninstall,
@@ -274,7 +274,7 @@ bool AndroidDeployQtStep::init()
emit addOutput(Tr::tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage); emit addOutput(Tr::tr("Deploying to %1").arg(m_serialNumber), OutputFormat::NormalMessage);
m_uninstallPreviousPackageRun = m_uninstallPreviousPackage(); m_uninstallPreviousPackageRun = m_uninstallPreviousPackage->value();
if (m_uninstallPreviousPackageRun) if (m_uninstallPreviousPackageRun)
m_manifestName = AndroidManager::manifestPath(target()); m_manifestName = AndroidManager::manifestPath(target());