aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/projecttree.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-07-13 14:17:12 +0200
committerEike Ziller <eike.ziller@qt.io>2018-07-13 14:17:12 +0200
commit241044323710b318289a8f6ebd49912cf13253e1 (patch)
treee782539eb1be12d95996b628276e85ca76ef419f /src/plugins/projectexplorer/projecttree.cpp
parent0374549b1e37e87ab34f3595a1211997f3391e4e (diff)
parenta92f39ec356d66681a183907288632a5779a7ab2 (diff)
Merge remote-tracking branch 'origin/4.7'
Diffstat (limited to 'src/plugins/projectexplorer/projecttree.cpp')
-rw-r--r--src/plugins/projectexplorer/projecttree.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp
index df02418238c..fc3175a1bcf 100644
--- a/src/plugins/projectexplorer/projecttree.cpp
+++ b/src/plugins/projectexplorer/projecttree.cpp
@@ -273,8 +273,8 @@ void ProjectTree::sessionAndTreeChanged()
void ProjectTree::collapseAll()
{
- if (m_focusForContextMenu)
- m_focusForContextMenu->collapseAll();
+ if (auto w = Utils::findOrDefault(s_instance->m_projectTreeWidgets, &ProjectTree::hasFocus))
+ w->collapseAll();
}
void ProjectTree::updateExternalFileWarning()