Show project name.

Task-number: QTCREATORBUG-12877
Change-Id: I6126903f82e3cfa1dd2669a9f7333410e99e1aee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

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");

src/plugins/android/androidrunconfiguration.h

@@ -50,10 +50,6 @@ public:
 
 protected:
     AndroidRunConfiguration(ProjectExplorer::Target *parent, AndroidRunConfiguration *source);
-    QString defaultDisplayName();
-
-private:
-    void init();
 };
 
 } // namespace Android

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;

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);