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

Android: Inline AndroidDeployStepWidget

Browse Source 
BuildStepConfigWidget with manual tweaks is good enough.

Also move AndroidDeployQtStepFactory to the usual place at the
end of the file.

Change-Id: I92af31ef77f986b6fcd84a14ac62b70e2da32ff2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-08-25 11:47:09 +02:00
parent 29a9565c89
commit 8cf1b598fe
4 changed files with 57 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,13 +62,11 @@ public:
enum UninstallType {
Keep,
Uninstall,
ForceUnintall
ForceUninstall
};
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Utils::Id id);
static Utils::Id stepId();
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
@@ -77,7 +75,6 @@ public:
signals:
void askForUninstall(DeployErrorCode errorCode);
void setSerialNumber(const QString &serialNumber);
private:
void runCommand(const Utils::CommandLine &command);
@@ -87,7 +84,6 @@ private:
void gatherFilesToPull();
DeployErrorCode runDeploy();
void slotAskForUninstall(DeployErrorCode errorCode);
void slotSetSerialNumber(const QString &serialNumber);
bool runImpl();
@@ -99,9 +95,6 @@ private:
void stdError(const QString &line);
DeployErrorCode parseDeployErrors(QString &deployOutputLine) const;
void slotProcessFinished(int, QProcess::ExitStatus);
void processFinished(int exitCode, QProcess::ExitStatus status);
friend void operator|=(DeployErrorCode &e1, const DeployErrorCode &e2) { e1 = static_cast<AndroidDeployQtStep::DeployErrorCode>((int)e1 | (int)e2); }
friend DeployErrorCode operator|(const DeployErrorCode &e1, const DeployErrorCode &e2) { return static_cast<AndroidDeployQtStep::DeployErrorCode>((int)e1 | (int)e2); }