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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
This commit is contained in:
Orgad Shaneh
2019-03-01 12:20:57 +02:00
parent 8983185405 aa14e396f0
commit cbfc6e522d
129 changed files with 1253 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -132,7 +132,7 @@ bool QmakePriFileNode::supportsAction(ProjectAction action, const Node *node) co
break;
}
case ProjectType::SubDirsTemplate:
if (action == AddSubProject || action == RemoveSubProject || action == AddExistingProject)
if (action == AddSubProject || action == AddExistingProject)
return true;
break;
default:
@@ -344,6 +344,13 @@ bool QmakeProFileNode::includedInExactParse() const
return pro && pro->includedInExactParse();
}
bool QmakeProFileNode::supportsAction(ProjectAction action, const Node *node) const
{
if (action == RemoveSubProject)
return parentProjectNode() && !parentProjectNode()->asContainerNode();
return QmakePriFileNode::supportsAction(action, node);
}
FolderNode::AddNewInformation QmakeProFileNode::addNewInformation(const QStringList &files, Node *context) const
{
Q_UNUSED(files)