diff --git a/src/plugins/android/androidrunconfiguration.cpp b/src/plugins/android/androidrunconfiguration.cpp index de6beed225a..d58d45a303c 100644 --- a/src/plugins/android/androidrunconfiguration.cpp +++ b/src/plugins/android/androidrunconfiguration.cpp @@ -46,18 +46,11 @@ namespace Android { AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, Core::Id id) : RunConfiguration(parent, id) { - init(); } AndroidRunConfiguration::AndroidRunConfiguration(Target *parent, AndroidRunConfiguration *source) : RunConfiguration(parent, source) { - init(); -} - -void AndroidRunConfiguration::init() -{ - setDefaultDisplayName(defaultDisplayName()); } QWidget *AndroidRunConfiguration::createConfigurationWidget() @@ -70,11 +63,6 @@ Utils::OutputFormatter *AndroidRunConfiguration::createOutputFormatter() const return new QtSupport::QtOutputFormatter(target()->project()); } -QString AndroidRunConfiguration::defaultDisplayName() -{ - return tr("Run on Android device"); -} - const QString AndroidRunConfiguration::remoteChannel() const { return QLatin1String(":5039"); diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index 2374f04e305..3ad639cec1a 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -50,10 +50,6 @@ public: protected: AndroidRunConfiguration(ProjectExplorer::Target *parent, AndroidRunConfiguration *source); - QString defaultDisplayName(); - -private: - void init(); }; } // namespace Android diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp index 76d2012a795..6fe1b7d5530 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp @@ -48,6 +48,13 @@ using QmakeProjectManager::QmakeProject; namespace QmakeAndroidSupport { namespace Internal { +static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:"; + +static QString pathFromId(const Core::Id id) +{ + return id.suffixAfter(ANDROID_RC_ID_PREFIX); +} + QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *parent, Core::Id id, const QString &path) : AndroidRunConfiguration(parent, id) , m_proFilePath(path) @@ -69,6 +76,7 @@ QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *parent, Qmake void QmakeAndroidRunConfiguration::init() { + setDefaultDisplayName(defaultDisplayName()); connect(target()->project(), SIGNAL(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool)), this, SLOT(proFileUpdated(QmakeProjectManager::QmakeProFileNode*,bool,bool))); } @@ -97,6 +105,11 @@ QVariantMap QmakeAndroidRunConfiguration::toMap() const return map; } +QString QmakeAndroidRunConfiguration::defaultDisplayName() +{ + return QFileInfo(pathFromId(id())).completeBaseName(); +} + bool QmakeAndroidRunConfiguration::isEnabled() const { return m_parseSuccess && !m_parseInProgress; diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h index c9cbe278d57..7142d13398e 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h @@ -55,6 +55,7 @@ protected: bool fromMap(const QVariantMap &map); QVariantMap toMap() const; + QString defaultDisplayName(); private slots: void proFileUpdated(QmakeProjectManager::QmakeProFileNode *pro, bool success, bool parseInProgress);