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

Android: Make runconfiguration use aspects

Browse Source 
Change-Id: I6d89de901e64b2f29d62073e458eb6cd86c44acd
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2018-05-04 16:01:13 +02:00
parent 54d6e3ad7b
commit 2487768388
11 changed files with 160 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/android/androidrunconfiguration.h
View File

@@ -27,36 +27,53 @@
#include "android_global.h"
#include "adbcommandswidget.h"
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/runconfigurationaspects.h>
namespace Android {
class BaseStringListAspect : public ProjectExplorer::IRunConfigurationAspect
{
Q_OBJECT
public:
explicit BaseStringListAspect(ProjectExplorer::RunConfiguration *rc,
const QString &settingsKey = QString(),
Core::Id id = Core::Id());
~BaseStringListAspect() override;
void addToConfigurationLayout(QFormLayout *layout) override;
QStringList value() const;
void setValue(const QStringList &val);
void setLabel(const QString &label);
void fromMap(const QVariantMap &map) override;
void toMap(QVariantMap &map) const override;
signals:
void changed();
private:
QStringList m_value;
QString m_label;
QPointer<Android::Internal::AdbCommandsWidget> m_widget; // Owned by RunConfigWidget
};
class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfiguration
{
Q_OBJECT
public:
explicit AndroidRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
QString disabledReason() const override;
QWidget *createConfigurationWidget() override;
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
QString disabledReason() const override;
const QStringList &amStartExtraArgs() const;
const QStringList &preStartShellCommands() const;
const QStringList &postFinishShellCommands() const;
private:
// FIXME: This appears to miss a copyFrom() implementation.
void setPreStartShellCommands(const QStringList &cmdList);
void setPostFinishShellCommands(const QStringList &cmdList);
void setAmStartExtraArgs(const QStringList &args);
void updateTargetInformation();
QStringList m_amStartExtraArgs;
QStringList m_preStartShellCommands;
QStringList m_postFinishShellCommands;
};
} // namespace Android