From ff7752eebf8ff71c3256ab8786b5a230b36995d3 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Tue, 12 Sep 2017 11:20:42 +0200
Subject: [PATCH] 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>
---
src/plugins/projectexplorer/projecttree.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp
index fcaf5d81783..5f4a0b780e8 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; }));
});
}
--
GitLab