feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix empty output tab header and run configuration name

Browse Source 
Task-number: QTCREATORBUG-19711
Change-Id: I5dc97129fa2e37360b9d74d99888703e049b9049
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Vikas Pachdha
2018-02-06 08:36:28 +01:00
parent 7797a2ba63
commit 267e938191
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
View File

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

2
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
View File

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