diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-24 15:49:09 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-06-21 12:08:12 +0200 |
| commit | 24314562165588b56a318b3b8a846bf5deda7c41 (patch) | |
| tree | b5dcf951e76d003c2623011b0e91994e06e7e061 /src/plugins/android/androidrunconfiguration.h | |
| parent | 8c77b8c9d7b25d0c89003c8c4a54e8da5bfb7edd (diff) | |
| download | qt-creator-24314562165588b56a318b3b8a846bf5deda7c41.tar.gz | |
Profile introduction
Introduce Profiles to store sets of values that describe a system/device.
These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.
This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.
Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/android/androidrunconfiguration.h')
| -rw-r--r-- | src/plugins/android/androidrunconfiguration.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index 1e34fac457..b62ee11ef2 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -56,7 +56,6 @@ class AndroidDeviceConfigListModel; class AndroidDeployStep; class AndroidRunConfigurationFactory; class AndroidToolChain; -class AndroidTarget; class AndroidRunConfiguration : public ProjectExplorer::RunConfiguration { @@ -71,12 +70,11 @@ public: enum DebuggingType { DebugCppOnly, DebugQmlOnly, DebugCppAndQml }; - AndroidRunConfiguration(AndroidTarget *parent, const QString &proFilePath); + AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path); virtual ~AndroidRunConfiguration(); QWidget *createConfigurationWidget(); Utils::OutputFormatter *createOutputFormatter() const; - AndroidTarget *androidTarget() const; Qt4ProjectManager::Qt4BuildConfiguration *activeQt4BuildConfiguration() const; AndroidDeployStep *deployStep() const; @@ -87,12 +85,12 @@ public: DebuggingType debuggingType() const; - const QString gdbCmd() const; + const Utils::FileName gdbCmd() const; const QString remoteChannel() const; const QString dumperLib() const; protected: - AndroidRunConfiguration(AndroidTarget *parent, AndroidRunConfiguration *source); + AndroidRunConfiguration(ProjectExplorer::Target *parent, AndroidRunConfiguration *source); QString defaultDisplayName(); private: |