From d7f96e3201ed8c2fd769caf7f6d6937a970c628e Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 22 May 2013 17:24:15 +0200
Subject: Android Deploy Options: Clean up ui

Task-number: QTCREATORBUG-9208

Change-Id: I1b1864908a24af3cd7c576831656267a6390b583
Reviewed-by: BogDan Vatra <bogdan@kde.org>
---
 src/plugins/android/androiddeploystep.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/plugins/android/androiddeploystep.h')

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;
-- 
cgit v1.2.1