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

QbsPM: Re-introduce uniqueProductName()

Browse Source 
This patch prepares for enhancing information stored inside
buildSystemTarget.

Change-Id: I5d81fd01ab6b06c162f47fd9536de697ddfd24a3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Christian Stenger
2017-06-09 07:53:21 +02:00
parent b57553b7a2
commit bde8ebc56c
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsnodes.cpp
View File

@@ -454,7 +454,7 @@ QList<ProjectExplorer::RunConfiguration *> QbsProductNode::runConfigurations() c
QbsRunConfiguration *qbsRc = qobject_cast<QbsRunConfiguration *>(rc); QbsRunConfiguration *qbsRc = qobject_cast<QbsRunConfiguration *>(rc);
if (!qbsRc) if (!qbsRc)
continue; continue;
if (qbsRc->buildSystemTarget() == QbsProject::uniqueProductName(qbsProductData())) if (qbsRc->uniqueProductName() == QbsProject::uniqueProductName(qbsProductData()))
result << qbsRc; result << qbsRc;
} }

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -955,7 +955,7 @@ void QbsProject::updateCppCodeModel()
rpp.setDisplayName(grp.name()); rpp.setDisplayName(grp.name());
rpp.setProjectFileLocation(grp.location().filePath(), rpp.setProjectFileLocation(grp.location().filePath(),
grp.location().line(), grp.location().column()); grp.location().line(), grp.location().column());
rpp.setBuildSystemTarget(uniqueProductName(prd)); rpp.setBuildSystemTarget(prd.name());
QHash<QString, qbs::ArtifactData> filePathToSourceArtifact; QHash<QString, qbs::ArtifactData> filePathToSourceArtifact;
bool hasCFiles = false; bool hasCFiles = false;

5
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -277,6 +277,11 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
} }
QString QbsRunConfiguration::buildSystemTarget() const QString QbsRunConfiguration::buildSystemTarget() const
{
return productDisplayNameFromId(id());
}
QString QbsRunConfiguration::uniqueProductName() const
{ {
return m_uniqueProductName; return m_uniqueProductName;
} }

1
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
View File

@@ -75,6 +75,7 @@ public:
void addToBaseEnvironment(Utils::Environment &env) const; void addToBaseEnvironment(Utils::Environment &env) const;
QString buildSystemTarget() const final; QString buildSystemTarget() const final;
QString uniqueProductName() const;
bool isConsoleApplication() const; bool isConsoleApplication() const;
signals: signals: