From c136e814224f0b01295ee1784bc771e53d98cb3c Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 20 Dec 2017 19:35:21 +0100 Subject: [PATCH] QmakeProject: Use base project node in two more cases Change-Id: If7648d0ef549ac7f2fdd6c2d13a82b06d0328232 Reviewed-by: Ulf Hermann --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 2 +- src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index aad98fa8ab3..de142605334 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -611,7 +611,7 @@ static FolderNode *folderOf(FolderNode *in, const FileName &fileName) // Find the QmakeProFileNode that contains a certain file. // First recurse down to folder, then find the pro-file. -static FileNode *fileNodeOf(QmakeProFileNode *in, const FileName &fileName) +static FileNode *fileNodeOf(FolderNode *in, const FileName &fileName) { for (FolderNode *folder = folderOf(in, fileName); folder; folder = folder->parentFolderNode()) { if (QmakeProFileNode *proFile = dynamic_cast(folder)) { diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 231be8b971f..dd1243c530d 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -348,7 +348,7 @@ void QmakeProjectManagerPlugin::updateContextActions() bool subProjectActionsVisible = false; if (qmakeProject && subProjectNode) { - if (QmakeProFileNode *rootNode = qmakeProject->rootProjectNode()) + if (ProjectNode *rootNode = qmakeProject->rootProjectNode()) subProjectActionsVisible = subProjectNode != rootNode; }