Android: Fix empty output tab header and run configuration name

Task-number: QTCREATORBUG-19711
Change-Id: I5dc97129fa2e37360b9d74d99888703e049b9049
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp

@@ -51,7 +51,11 @@ static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfigur
 
 QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *target)
     : AndroidRunConfiguration(target, ANDROID_RC_ID_PREFIX)
-{}
+{
+    connect(target->project(), &Project::parsingFinished, this, [this]() {
+        updateDisplayName();
+    });
+}
 
 QString QmakeAndroidRunConfiguration::extraId() const
 {
@@ -72,7 +76,6 @@ bool QmakeAndroidRunConfiguration::fromMap(const QVariantMap &map)
     if (!extraId.isEmpty())
         m_proFilePath = Utils::FileName::fromString(extraId);
 
-    setDefaultDisplayName(defaultDisplayName());
     return true;
 }
 
@@ -86,17 +89,15 @@ QVariantMap QmakeAndroidRunConfiguration::toMap() const
     return map;
 }
 
-QString QmakeAndroidRunConfiguration::defaultDisplayName()
+void QmakeAndroidRunConfiguration::updateDisplayName()
 {
     QmakeProject *project = qmakeProject();
     const QmakeProjectManager::QmakeProFileNode *root = project->rootProjectNode();
     if (root) {
         const QmakeProjectManager::QmakeProFileNode *node = root->findProFileFor(m_proFilePath);
         if (node) // should always be found
-            return node->displayName();
+            setDefaultDisplayName(node->displayName());
     }
-
-    return QString();
 }
 
 QString QmakeAndroidRunConfiguration::disabledReason() const

src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h

@@ -49,7 +49,7 @@ private:
     QString extraId() const final;
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
-    QString defaultDisplayName();
+    void updateDisplayName();
 
     QmakeProjectManager::QmakeProject *qmakeProject() const;