diff options
author | Daniel Teske <daniel.teske@digia.com> | 2013-05-22 17:24:15 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@digia.com> | 2013-05-29 15:15:56 +0200 |
commit | d7f96e3201ed8c2fd769caf7f6d6937a970c628e (patch) | |
tree | 95355fa599f52d88bc5e6c5f30583665f3843558 /src/plugins/android/androiddeploystep.h | |
parent | e2591965938b83aa8c27daf090a2b2a2f746df57 (diff) | |
download | qt-creator-d7f96e3201ed8c2fd769caf7f6d6937a970c628e.tar.gz |
Android Deploy Options: Clean up ui
Task-number: QTCREATORBUG-9208
Change-Id: I1b1864908a24af3cd7c576831656267a6390b583
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androiddeploystep.h')
-rw-r--r-- | src/plugins/android/androiddeploystep.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/android/androiddeploystep.h b/src/plugins/android/androiddeploystep.h index 0fa090aa54..ad922c46e1 100644 --- a/src/plugins/android/androiddeploystep.h +++ b/src/plugins/android/androiddeploystep.h @@ -75,9 +75,10 @@ class AndroidDeployStep : public ProjectExplorer::BuildStep public: enum AndroidDeployAction { - NoDeploy, + NoDeploy, // use ministro DeployLocal, - InstallQASI + InstallQASI, // unused old value + BundleLibraries }; public: @@ -89,28 +90,25 @@ public: int deviceAPILevel(); AndroidDeployAction deployAction(); - bool useLocalQtLibs(); bool fromMap(const QVariantMap &map); QVariantMap toMap() const; void cleanLibsOnDevice(); + void installQASIPackage(const QString &packagePath); public slots: void setDeployAction(AndroidDeployAction deploy); - void setDeployQASIPackagePath(const QString &package); - void setUseLocalQtLibs(bool useLocal); signals: void done(); void error(); - void resetDelopyAction(); private slots: bool deployPackage(); void handleBuildOutput(); void handleBuildError(); - void cleanLibsFinished(); + void processFinished(); private: AndroidDeployStep(ProjectExplorer::BuildStepList *bc, @@ -140,7 +138,6 @@ private: QString m_QASIPackagePath; AndroidDeployAction m_deployAction; - bool m_useLocalQtLibs; // members to transfer data from init() to run QString m_packageName; |