From f31d9b0b183e0067550e312807381ff958d1c2ac Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 1 Mar 2017 14:21:02 +0100 Subject: [PATCH] ProjectExplorer: Fix global 'Build Subproject' action Change-Id: I004e87bcf3abab1d5160178a93f5e1bac50f6e86 Reviewed-by: Tobias Hunger --- .../qmakeprojectmanager/qmakeprojectmanagerplugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 33102fa7e16..df5b0c87412 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -326,16 +326,16 @@ void QmakeProjectManagerPlugin::updateContextActions() FileNode *fileNode = node ? node->asFileNode() : nullptr; bool buildFilePossible = subProjectNode && fileNode && (fileNode->fileType() == FileType::Source); - bool subProjectActionsVisible = qmakeProject && proFileNode && (proFileNode != qmakeProject->rootProjectNode()); + bool subProjectActionsVisible = qmakeProject && subProjectNode && (subProjectNode != qmakeProject->rootProjectNode()); QString subProjectName; if (subProjectActionsVisible) - subProjectName = proFileNode->displayName(); + subProjectName = subProjectNode->displayName(); m_buildSubProjectAction->setParameter(subProjectName); m_rebuildSubProjectAction->setParameter(subProjectName); m_cleanSubProjectAction->setParameter(subProjectName); - m_buildSubProjectContextMenu->setParameter(subProjectName); + m_buildSubProjectContextMenu->setParameter(proFileNode ? proFileNode->displayName() : QString()); m_buildFileAction->setParameter(buildFilePossible ? fileNode->filePath().fileName() : QString()); auto buildConfiguration = (qmakeProject && qmakeProject->activeTarget()) ?