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

Android: Remember 'Use local qt libs' deploy setting

Browse Source 
Change-Id: Id673f2a28d720c803342948adc4e89678d1a6390
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tyler Mandry
2012-06-25 00:48:17 -07:00
committed by Tobias Hunger
parent 15088e76ed
commit 17eedb2af9
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/android/androiddeploystep.cpp
View File

@@ -58,6 +58,8 @@ using namespace Qt4ProjectManager;
namespace Android { namespace Android {
namespace Internal { namespace Internal {
static const char USE_LOCAL_QT_KEY[] = "Qt4ProjectManager.AndroidDeployStep.UseLocalQtLibs";
const Core::Id AndroidDeployStep::Id("Qt4ProjectManager.AndroidDeployStep"); const Core::Id AndroidDeployStep::Id("Qt4ProjectManager.AndroidDeployStep");
AndroidDeployStep::AndroidDeployStep(ProjectExplorer::BuildStepList *parent) AndroidDeployStep::AndroidDeployStep(ProjectExplorer::BuildStepList *parent)
@@ -131,6 +133,19 @@ bool AndroidDeployStep::useLocalQtLibs()
return m_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) void AndroidDeployStep::setDeployAction(AndroidDeployStep::AndroidDeployAction deploy)
{ {
m_deployAction = deploy; m_deployAction = deploy;

3
src/plugins/android/androiddeploystep.h
View File

@@ -75,6 +75,9 @@ public:
AndroidDeployAction deployAction(); AndroidDeployAction deployAction();
bool useLocalQtLibs(); bool useLocalQtLibs();
bool fromMap(const QVariantMap &map);
QVariantMap toMap() const;
public slots: public slots:
void setDeployAction(AndroidDeployAction deploy); void setDeployAction(AndroidDeployAction deploy);
void setDeployQASIPackagePath(const QString &package); void setDeployQASIPackagePath(const QString &package);