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

QmakeProject: Use base project node in two more cases

Browse Source 
Change-Id: If7648d0ef549ac7f2fdd6c2d13a82b06d0328232
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
hjk
2017-12-20 19:35:21 +01:00
parent 0e687d6a4f
commit c136e81422
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -611,7 +611,7 @@ static FolderNode *folderOf(FolderNode *in, const FileName &fileName)
// Find the QmakeProFileNode that contains a certain file. // Find the QmakeProFileNode that contains a certain file.
// First recurse down to folder, then find the pro-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()) { for (FolderNode *folder = folderOf(in, fileName); folder; folder = folder->parentFolderNode()) {
if (QmakeProFileNode *proFile = dynamic_cast<QmakeProFileNode *>(folder)) { if (QmakeProFileNode *proFile = dynamic_cast<QmakeProFileNode *>(folder)) {

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

@@ -348,7 +348,7 @@ void QmakeProjectManagerPlugin::updateContextActions()
bool subProjectActionsVisible = false; bool subProjectActionsVisible = false;
if (qmakeProject && subProjectNode) { if (qmakeProject && subProjectNode) {
if (QmakeProFileNode *rootNode = qmakeProject->rootProjectNode()) if (ProjectNode *rootNode = qmakeProject->rootProjectNode())
subProjectActionsVisible = subProjectNode != rootNode; subProjectActionsVisible = subProjectNode != rootNode;
} }