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

Qmake: Fix build/run qmake from context menu again

Browse Source 
This got broken when refactoring the project nodes.

Change-Id: Iae4614f4a367cefeba3f70faaf19bc2f8994fb0f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-28 14:13:41 +01:00
parent cd1fd0fba9
commit 563b5033f8
4 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
View File

@@ -71,10 +71,6 @@ using namespace QmakeProjectManager::Internal;
using namespace QmakeProjectManager;
using namespace ProjectExplorer;
QmakeProjectManagerPlugin::~QmakeProjectManagerPlugin()
{
}
bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments)
@@ -318,17 +314,23 @@ void QmakeProjectManagerPlugin::updateContextActions()
Project *project = ProjectTree::currentProject();
m_addLibraryActionContextMenu->setEnabled(dynamic_cast<QmakeProFileNode *>(node));
FileNode *proFileNode = QmakeManager::contextFile();
QmakeProject *qmakeProject = QmakeManager::contextProject();
Node *subProjectNode = QmakeManager::contextNode();
auto proFileNode = dynamic_cast<QmakeProFileNode *>(node);
QmakeProject *qmakeProject = qobject_cast<QmakeProject *>(QmakeManager::contextProject());
QmakeProFileNode *subProjectNode = nullptr;
if (node) {
auto subPriFileNode = dynamic_cast<QmakePriFileNode *>(node);
if (!subPriFileNode)
subPriFileNode = dynamic_cast<QmakePriFileNode *>(node->parentProjectNode());
subProjectNode = subPriFileNode ? subPriFileNode->proFileNode() : nullptr;
}
FileNode *fileNode = node ? node->asFileNode() : nullptr;
bool buildFilePossible = subProjectNode && fileNode && (fileNode->fileType() == FileType::Source);
bool subProjectActionsVisible = qmakeProject && subProjectNode && (subProjectNode != qmakeProject->rootProjectNode());
bool subProjectActionsVisible = qmakeProject && proFileNode && (proFileNode != qmakeProject->rootProjectNode());
QString subProjectName;
if (subProjectActionsVisible)
subProjectName = subProjectNode->displayName();
subProjectName = proFileNode->displayName();
m_buildSubProjectAction->setParameter(subProjectName);
m_rebuildSubProjectAction->setParameter(subProjectName);