diff options
| author | hjk <[email protected]> | 2012-07-25 17:41:01 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2012-07-26 12:50:06 +0200 |
| commit | b906360a341800b84b5c8e0e2442698de10beb9e (patch) | |
| tree | 4baf03f4aeb817c2c622c033fc7dd33674ab1038 /src/plugins/android/androidrunconfiguration.cpp | |
| parent | 0fcd30cc6191925ea3cba2baad6533a946c9ccd2 (diff) | |
madde/qnx/remotelinux: adjust after profile changes
More Profile use, less dependency on QtSupport,
Derive qtVersionId from profile instead of qt build configuration.
Replace qt4BuildConfiguration with buildConfiguration.
Use IDevice base class in AbstractRemoteLinuxApplicationRunner
and in other places. Simplify remote linux runconfiguration
Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src/plugins/android/androidrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/android/androidrunconfiguration.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index ac944fae72f..d7ea4edd37e 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -38,19 +38,14 @@ #include <projectexplorer/target.h> #include <qtsupport/qtoutputformatter.h> #include <qtsupport/qtprofileinformation.h> -#include <qt4projectmanager/qt4buildconfiguration.h> -#include <qt4projectmanager/qt4project.h> #include <utils/qtcassert.h> - -using namespace Qt4ProjectManager; +using namespace ProjectExplorer; namespace Android { namespace Internal { -using namespace ProjectExplorer; - AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, Core::Id id, const QString &path) : RunConfiguration(parent, id) , m_proFilePath(path) @@ -58,8 +53,7 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, Core::Id id, co init(); } -AndroidRunConfiguration::AndroidRunConfiguration(ProjectExplorer::Target *parent, - AndroidRunConfiguration *source) +AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, AndroidRunConfiguration *source) : RunConfiguration(parent, source) , m_proFilePath(source->m_proFilePath) { @@ -71,15 +65,6 @@ void AndroidRunConfiguration::init() setDefaultDisplayName(defaultDisplayName()); } -AndroidRunConfiguration::~AndroidRunConfiguration() -{ -} - -Qt4BuildConfiguration *AndroidRunConfiguration::activeQt4BuildConfiguration() const -{ - return static_cast<Qt4BuildConfiguration *>(activeBuildConfiguration()); -} - QWidget *AndroidRunConfiguration::createConfigurationWidget() { return 0;// no special running configurations |