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

Android: Aspectify AndroidDeployQtStep

Browse Source 
Change-Id: Ibc2f04336831494c04a2283a59e1f550776c8bf3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-10-09 15:24:33 +02:00
parent 5467faa0d7
commit 5a97fa53dc
2 changed files with 18 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androiddeployqtstep.h
View File

@@ -59,20 +59,8 @@ class AndroidDeployQtStep : public ProjectExplorer::BuildStep
};
public:
enum UninstallType {
Keep,
Uninstall,
ForceUninstall
};
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
UninstallType uninstallPreviousPackage();
void setUninstallPreviousPackage(bool uninstall);
signals:
void askForUninstall(DeployErrorCode errorCode);
@@ -105,7 +93,7 @@ private:
QMap<QString, QString> m_filesToPull;
QStringList m_androidABIs;
bool m_uninstallPreviousPackage = false;
Utils::BoolAspect *m_uninstallPreviousPackage = nullptr;
bool m_uninstallPreviousPackageRun = false;
bool m_useAndroiddeployqt = false;
bool m_askForUninstall = false;