From 4657ac7452662d19823412e82d599bf4079a3c4d Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 4 Jul 2014 14:28:55 +0200 Subject: AndroidRunConfigurations: Split up into general and qmake specific parts The plan is to eventually move the qmake specific class into the qmake plugin. Change-Id: I5653c45ed88b1be296f4963ab4117bbfa791fb85 Reviewed-by: BogDan Vatra --- src/plugins/android/androidrunconfiguration.h | 28 +++------------------------ 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'src/plugins/android/androidrunconfiguration.h') diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index 2a4be87f20..2374f04e30 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -30,54 +30,32 @@ #ifndef ANDROIDRUNCONFIGURATION_H #define ANDROIDRUNCONFIGURATION_H +#include "android_global.h" #include "androidconstants.h" #include "androidconfigurations.h" #include -namespace QmakeProjectManager { class QmakeProFileNode; } - namespace Android { -namespace Internal { - -class AndroidDeployStep; -class AndroidRunConfigurationFactory; -class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration +class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfiguration { Q_OBJECT - friend class AndroidRunConfigurationFactory; - public: - AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path); + AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); QWidget *createConfigurationWidget(); Utils::OutputFormatter *createOutputFormatter() const; - - void setArguments(const QString &args); - QString proFilePath() const; - const QString remoteChannel() const; - bool isEnabled() const; - QString disabledReason() const; protected: AndroidRunConfiguration(ProjectExplorer::Target *parent, AndroidRunConfiguration *source); QString defaultDisplayName(); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; -private slots: - void proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, bool parseInProgress); private: void init(); - - QString m_proFilePath; - bool m_parseSuccess; - bool m_parseInProgress; }; -} // namespace Internal } // namespace Android #endif // ANDROIDRUNCONFIGURATION_H -- cgit v1.2.1