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

Fixes Permission model downgrade issue

Browse Source 
Task-number: QTCREATORBUG-16630
Change-Id: I2ec8fbe186d9a78efa1457a5fbbbaf1fe4da80b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Vikas Pachdha
2016-07-28 17:33:10 +02:00
parent 5cdff92c58
commit 7458d82a37
2 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,9 @@ class AndroidDeployQtStep : public ProjectExplorer::BuildStep
{
NoError = 0,
InconsistentCertificates = 0x0001,
UpdateIncompatible = 0x0002
UpdateIncompatible = 0x0002,
PermissionModelDowngrade = 0x0004,
Failure = 0x0008
};
public:
@@ -88,7 +90,7 @@ public:
void setUninstallPreviousPackage(bool uninstall);
signals:
void askForUninstall();
void askForUninstall(DeployErrorCode errorCode);
void setSerialNumber(const QString &serialNumber);
private:
@@ -98,9 +100,8 @@ private:
bool init(QList<const BuildStep *> &earlierSteps) override;
void run(QFutureInterface<bool> &fi) override;
enum DeployResult { Success, Failure, AskUinstall };
DeployResult runDeploy(QFutureInterface<bool> &fi);
void slotAskForUninstall();
DeployErrorCode runDeploy(QFutureInterface<bool> &fi);
void slotAskForUninstall(DeployErrorCode errorCode);
void slotSetSerialNumber(const QString &serialNumber);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;