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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
This commit is contained in:
Eike Ziller
2014-11-24 15:43:48 +01:00
parent 63487158f1 a4a4f7a475
commit a47fbb8309
310 changed files with 5678 additions and 8466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -375,7 +375,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<QbsProductNode *>(m_selectedNode);
QTC_ASSERT(productNode, return);
buildProducts(m_selectedProject,
QStringList(QbsProject::uniqueProductName(productNode->qbsProductData())));
}
void QbsProjectManagerPlugin::buildProduct()
@@ -388,7 +392,8 @@ void QbsProjectManagerPlugin::buildProduct()
if (!product)
return;
buildProducts(m_editorProject, QStringList(product->displayName()));
buildProducts(m_editorProject,
QStringList(QbsProject::uniqueProductName(product->qbsProductData())));
}
void QbsProjectManagerPlugin::buildSubprojectContextMenu()