summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2017-09-12 11:20:42 +0200
committerTobias Hunger <tobias.hunger@qt.io>2017-09-12 11:50:29 +0000
commitff7752eebf8ff71c3256ab8786b5a230b36995d3 (patch)
tree14ce7efbe10f355715aab2a8b0f1e8eabcb04576
parent6d0c167ba77021391099f518f975682460b72642 (diff)
downloadqt-creator-ff7752eebf8ff71c3256ab8786b5a230b36995d3.tar.gz
ProjectTree: Handle containerNode in ProjectTree::hasNode
This fixes e.g. "Add Existing Files..." triggered on the top-level node of a project. Task-number: QTCREATORBUG-18896 Change-Id: I763e9a31edbcfd8ac9a4f8b8b30ef885789ad1a5 Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--src/plugins/projectexplorer/projecttree.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp
index fcaf5d8178..5f4a0b780e 100644
--- a/src/plugins/projectexplorer/projecttree.cpp
+++ b/src/plugins/projectexplorer/projecttree.cpp
@@ -386,7 +386,9 @@ void ProjectTree::applyTreeManager(FolderNode *folder)
bool ProjectTree::hasNode(const Node *node)
{
return Utils::contains(SessionManager::projects(), [node](const Project *p) {
- return p && p->rootProjectNode() && p->rootProjectNode()->findNode([node](const Node *n) { return n == node; });
+ return p && p->rootProjectNode() && (
+ p->containerNode() == node
+ || p->rootProjectNode()->findNode([node](const Node *n) { return n == node; }));
});
}