aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-05-09 10:17:02 +0200
committerEike Ziller <eike.ziller@qt.io>2019-05-09 12:30:59 +0000
commit0cab1f1762d1cf2aca473d47f0cb0f060b9d709c (patch)
tree0c7e30d08d05bf901cf4efe300093a5bda92f7e5
parentda1bca07a182195fdcb4fbb83abe05e9f63b33f4 (diff)
Fix directory used for "Find in This Directory"
If the input already is a directory, we want to search in that, not the parent. Fixes: QTCREATORBUG-22079 Change-Id: If47435ecf2ffba088d50b57c18c8b1ee444fd718 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/coreplugin/editormanager/editormanager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index a0fd5bdc7e..1dc2236873 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -2296,7 +2296,9 @@ void EditorManagerPrivate::findInDirectory()
{
if (!d->m_contextMenuEntry || d->m_contextMenuEntry->fileName().isEmpty())
return;
- emit m_instance->findOnFileSystemRequest(d->m_contextMenuEntry->fileName().parentDir().toString());
+ const FileName path = d->m_contextMenuEntry->fileName();
+ emit m_instance->findOnFileSystemRequest(
+ (path.toFileInfo().isDir() ? path : path.parentDir()).toString());
}
void EditorManagerPrivate::split(Qt::Orientation orientation)