Commit 17eedb2a authored by Tyler Mandry's avatar Tyler Mandry Committed by Tobias Hunger
Browse files

Android: Remember 'Use local qt libs' deploy setting



Change-Id: Id673f2a28d720c803342948adc4e89678d1a6390
Reviewed-by: default avatarBogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 15088e76
......@@ -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;
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment