diff options
| author | Nikita Baryshnikov <nib952051@gmail.com> | 2017-10-20 13:28:15 +0300 |
|---|---|---|
| committer | Nikita Baryshnikov <nib952051@gmail.com> | 2017-10-20 17:10:01 +0000 |
| commit | 9a61bf2a5fc8ca34b8ab7b886698dbf13b01400a (patch) | |
| tree | 38fcae56c98eb5b6a00c97a9737b1804ebcf84b1 | |
| parent | ce4d7e9d0e6bb5c761d41b9bdfbad0624dcbb994 (diff) | |
Locator: make sure that parent dir is always first
in FileSystemFilter
Change-Id: Idb4e0510b6d7e9e5de3fc32880c1fc1d423902ac
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/coreplugin/locator/filesystemfilter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp index 7a4be1eee9..60633022a8 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.cpp +++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp @@ -87,7 +87,7 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF directory.prepend(m_currentDocumentDirectory + "/"); } QDir dirInfo(directory); - QDir::Filters dirFilter = QDir::Dirs|QDir::Drives|QDir::NoDot; + QDir::Filters dirFilter = QDir::Dirs|QDir::Drives|QDir::NoDot|QDir::NoDotDot; QDir::Filters fileFilter = QDir::Files; if (m_includeHidden) { dirFilter |= QDir::Hidden; @@ -100,6 +100,8 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF QDir::Name|QDir::IgnoreCase|QDir::LocaleAware); QStringList files = dirInfo.entryList(fileFilter, QDir::Name|QDir::IgnoreCase|QDir::LocaleAware); + dirs.prepend(".."); + foreach (const QString &dir, dirs) { if (future.isCanceled()) break; |