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

AndroidRunConfigurations: Split up into general and qmake specific parts

Browse Source 
The plan is to eventually move the qmake specific class into the
qmake plugin.

Change-Id: I5653c45ed88b1be296f4963ab4117bbfa791fb85
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-07-04 14:28:55 +02:00
parent 6a4c47b176
commit 4657ac7452
15 changed files with 465 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,54 +30,32 @@
#ifndef ANDROIDRUNCONFIGURATION_H
#define ANDROIDRUNCONFIGURATION_H
#include "android_global.h"
#include "androidconstants.h"
#include "androidconfigurations.h"
#include <projectexplorer/runconfiguration.h>
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