aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/projecttree.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-09-30 17:33:52 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-10-01 08:39:04 +0000
commitec15cf23f3a2e6154d5ae3a08777501368d346d5 (patch)
treec4c121de37c8814e5d6cf075a50fa00d66d81246 /src/plugins/projectexplorer/projecttree.cpp
parent4ce705554a2dcb8d6a78761c3a5c6e8c46b30423 (diff)
Project Tree: Fix focus issue
Some godawful global focus state was set too late, resulting in weird behavior after an action in the context menu was activated via the keyboard. (Namely: If you did that *once*, the "Add New File..." entry would *forever* be disabled in all subsequent context menus, regardless of project, session etc.) Fixes: QTCREATORBUG-22850 Change-Id: I0afed61b65ac5064cb6a229c9bfa45445a3a6c34 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/projecttree.cpp')
-rw-r--r--src/plugins/projectexplorer/projecttree.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projecttree.cpp b/src/plugins/projectexplorer/projecttree.cpp
index 5010b18b876..8fda8340d71 100644
--- a/src/plugins/projectexplorer/projecttree.cpp
+++ b/src/plugins/projectexplorer/projecttree.cpp
@@ -352,8 +352,8 @@ void ProjectTree::showContextMenu(ProjectTreeWidget *focus, const QPoint &global
}
if (contextMenu && contextMenu->actions().count() > 0) {
- contextMenu->popup(globalPos);
s_instance->m_focusForContextMenu = focus;
+ contextMenu->popup(globalPos);
connect(contextMenu, &QMenu::aboutToHide,
s_instance, &ProjectTree::hideContextMenu,
Qt::ConnectionType(Qt::UniqueConnection | Qt::QueuedConnection));