diff --git a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp index 9ebdf031942..7c84847c6bb 100644 --- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp @@ -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()); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index b0df6974cf2..4b1691cc8d8 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -640,18 +640,9 @@ void QbsProject::generateErrors(const qbs::ErrorInfo &e) } -QString QbsProject::productDisplayName(const qbs::Project &project, - const qbs::ProductData &product) -{ - QString displayName = product.name(); - if (product.profile() != project.profile()) - displayName.append(QLatin1String(" [")).append(product.profile()).append(QLatin1Char(']')); - return displayName; -} - QString QbsProject::uniqueProductName(const qbs::ProductData &product) { - return product.name() + QLatin1Char('.') + product.profile(); + return product.name() + QLatin1Char('.') + product.multiplexConfigurationId(); } void QbsProject::configureAsExampleProject(const QSet &platforms) @@ -1113,7 +1104,7 @@ void QbsProject::updateApplicationTargets() foreach (const qbs::ProductData &productData, m_projectData.allProducts()) { if (!productData.isEnabled() || !productData.isRunnable()) continue; - const QString displayName = productDisplayName(m_qbsProject, productData); + const QString displayName = productData.fullDisplayName(); if (productData.targetArtifacts().isEmpty()) { // No build yet. applications.list << BuildTargetInfo(displayName, FileName(), diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index 45befb2e675..afa2473f337 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -101,8 +101,6 @@ public: bool needsSpecialDeployment() const override; void generateErrors(const qbs::ErrorInfo &e); - static QString productDisplayName(const qbs::Project &project, - const qbs::ProductData &product); static QString uniqueProductName(const qbs::ProductData &product); void configureAsExampleProject(const QSet &platforms) final; diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 8595b7dfbfa..e2324f39f91 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -407,7 +407,7 @@ QList QbsRunConfigurationFactory::availableBuildTargets(Target } return Utils::transform(products, [project](const qbs::ProductData &product) { - QString displayName = QbsProject::productDisplayName(project->qbsProject(), product); + QString displayName = product.fullDisplayName(); BuildTargetInfo bti; bti.targetName = QbsProject::uniqueProductName(product) + rcNameSeparator() + displayName; bti.displayName = displayName;