From 7a77ac5dd1f02cc91c57f549b8711bbcc5ea5a71 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 23 Nov 2018 11:36:42 +0100 Subject: [PATCH] Do not search our own autosave files by default When doing a "Files in File System" search. Also make sure that the default filter is always available in the drop down. Fixes: QTCREATORBUG-21541 Change-Id: Id8b315691b78e5d956cebf73067683dea8f8ca51 Reviewed-by: David Schulz --- src/plugins/texteditor/basefilefind.cpp | 2 +- src/plugins/texteditor/findinfiles.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index fbbdaef8266..39e85f50311 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -427,7 +427,7 @@ void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaul syncComboWithSettings(d->m_filterCombo, d->m_filterSetting); QStringList exclusionFilters = settings->value("exclusionFilters").toStringList(); - if (exclusionFilters.isEmpty()) + if (!exclusionFilters.contains(defaultExclusionFilter)) exclusionFilters << defaultExclusionFilter; const QVariant currentExclusionFilter = settings->value("currentExclusionFilter"); d->m_exclusionSetting = currentExclusionFilter.isValid() ? currentExclusionFilter.toString() diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 7d7c1efb5ca..8d461038700 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -220,7 +220,7 @@ void FindInFiles::writeSettings(QSettings *settings) void FindInFiles::readSettings(QSettings *settings) { settings->beginGroup(QLatin1String("FindInFiles")); - readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*"); + readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave"); settings->endGroup(); }