From 7188689e3df06c061a4ea97e6395b0a4df9c07e9 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 17 Nov 2014 16:45:38 +0100 Subject: [PATCH] QbsProjectManager: Fix Per-product build. We compared the display name to the unique product name to look up the product to build, but these two are typically not the same. Change-Id: I82d1433c5c830a38c55f6b8827a5137ff31fd859 Task-number: QBS-705 Reviewed-by: Tobias Hunger --- .../qbsprojectmanager/qbsprojectmanagerplugin.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index dc5bbe251a3..edf8855ead1 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -373,7 +373,11 @@ void QbsProjectManagerPlugin::buildProductContextMenu() QTC_ASSERT(m_selectedNode, return); QTC_ASSERT(m_selectedProject, return); - buildProducts(m_selectedProject, QStringList(m_selectedNode->displayName())); + const QbsProductNode * const productNode = qobject_cast(m_selectedNode); + QTC_ASSERT(productNode, return); + + buildProducts(m_selectedProject, + QStringList(QbsProject::uniqueProductName(productNode->qbsProductData()))); } void QbsProjectManagerPlugin::buildProduct() @@ -386,7 +390,8 @@ void QbsProjectManagerPlugin::buildProduct() if (!product) return; - buildProducts(m_editorProject, QStringList(product->displayName())); + buildProducts(m_editorProject, + QStringList(QbsProject::uniqueProductName(product->qbsProductData()))); } void QbsProjectManagerPlugin::buildSubprojectContextMenu()