From 17eedb2af97227ec8b8f73dc53869208403cbf03 Mon Sep 17 00:00:00 2001
From: Tyler Mandry <tmandry@gmail.com>
Date: Mon, 25 Jun 2012 00:48:17 -0700
Subject: [PATCH] Android: Remember 'Use local qt libs' deploy setting

Change-Id: Id673f2a28d720c803342948adc4e89678d1a6390
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
 src/plugins/android/androiddeploystep.cpp | 15 +++++++++++++++
 src/plugins/android/androiddeploystep.h   |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp
index 3cbd1cbea3d..1eccb557818 100644
--- a/src/plugins/android/androiddeploystep.cpp
+++ b/src/plugins/android/androiddeploystep.cpp
@@ -58,6 +58,8 @@ using namespace Qt4ProjectManager;
 namespace Android {
 namespace Internal {
 
+static const char USE_LOCAL_QT_KEY[] = "Qt4ProjectManager.AndroidDeployStep.UseLocalQtLibs";
+
 const Core::Id AndroidDeployStep::Id("Qt4ProjectManager.AndroidDeployStep");
 
 AndroidDeployStep::AndroidDeployStep(ProjectExplorer::BuildStepList *parent)
@@ -131,6 +133,19 @@ bool AndroidDeployStep::useLocalQtLibs()
     return m_useLocalQtLibs;
 }
 
+bool AndroidDeployStep::fromMap(const QVariantMap &map)
+{
+    m_useLocalQtLibs = map.value(QLatin1String(USE_LOCAL_QT_KEY), false).toBool();
+    return ProjectExplorer::BuildStep::fromMap(map);
+}
+
+QVariantMap AndroidDeployStep::toMap() const
+{
+    QVariantMap map = ProjectExplorer::BuildStep::toMap();
+    map.insert(QLatin1String(USE_LOCAL_QT_KEY), m_useLocalQtLibs);
+    return map;
+}
+
 void AndroidDeployStep::setDeployAction(AndroidDeployStep::AndroidDeployAction deploy)
 {
     m_deployAction = deploy;
diff --git a/src/plugins/android/androiddeploystep.h b/src/plugins/android/androiddeploystep.h
index f76e248c281..133cc565bb5 100644
--- a/src/plugins/android/androiddeploystep.h
+++ b/src/plugins/android/androiddeploystep.h
@@ -75,6 +75,9 @@ public:
     AndroidDeployAction deployAction();
     bool useLocalQtLibs();
 
+    bool fromMap(const QVariantMap &map);
+    QVariantMap toMap() const;
+
 public slots:
     void setDeployAction(AndroidDeployAction deploy);
     void setDeployQASIPackagePath(const QString &package);