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

QbsProjectManager: Fix uniqueProductName() and productDisplayName()

Browse Source 
These still assumed we can only multiplex on profiles.

Change-Id: Ice3dfe06c1be732ecae42db75155e930b0554b6f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Christian Kandeler
2018-02-09 17:18:29 +01:00
parent 7bca91cd23
commit 8c7567c447
4 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
View File

@@ -103,13 +103,13 @@ QbsProjectManager::Internal::QbsGroupNode
}
void setupQbsProductData(QbsProjectManager::Internal::QbsProductNode *node,
const qbs::ProductData &prd, const qbs::Project &project)
const qbs::ProductData &prd)
{
using namespace QbsProjectManager::Internal;
node->setEnabled(prd.isEnabled());
node->setDisplayName(QbsProject::productDisplayName(project, prd));
node->setDisplayName(prd.fullDisplayName());
node->setAbsoluteFilePathAndLine(Utils::FileName::fromString(prd.location().filePath()).parentDir(), -1);
const QString &productPath = QFileInfo(prd.location().filePath()).absolutePath();
@@ -137,12 +137,11 @@ void setupQbsProductData(QbsProjectManager::Internal::QbsProductNode *node,
setupArtifacts(genFiles, prd.generatedArtifacts());
}
QbsProjectManager::Internal::QbsProductNode *
buildProductNodeTree(const qbs::Project &project, const qbs::ProductData &prd)
QbsProjectManager::Internal::QbsProductNode *buildProductNodeTree(const qbs::ProductData &prd)
{
auto result = new QbsProjectManager::Internal::QbsProductNode(prd);
setupQbsProductData(result, prd, project);
setupQbsProductData(result, prd);
return result;
}
@@ -162,7 +161,7 @@ void setupProjectNode(QbsProjectManager::Internal::QbsProjectNode *node, const q
}
foreach (const qbs::ProductData &prd, prjData.products())
node->addNode(buildProductNodeTree(qbsProject, prd));
node->addNode(buildProductNodeTree(prd));
if (!prjData.name().isEmpty())
node->setDisplayName(prjData.name());