feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do not search our own autosave files by default

Browse Source 
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 <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2018-11-23 11:36:42 +01:00
parent 9e17bd1bf0
commit 7a77ac5dd1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/basefilefind.cpp
View File

@@ -427,7 +427,7 @@ void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaul
syncComboWithSettings(d->m_filterCombo, d->m_filterSetting); syncComboWithSettings(d->m_filterCombo, d->m_filterSetting);
QStringList exclusionFilters = settings->value("exclusionFilters").toStringList(); QStringList exclusionFilters = settings->value("exclusionFilters").toStringList();
if (exclusionFilters.isEmpty()) if (!exclusionFilters.contains(defaultExclusionFilter))
exclusionFilters << defaultExclusionFilter; exclusionFilters << defaultExclusionFilter;
const QVariant currentExclusionFilter = settings->value("currentExclusionFilter"); const QVariant currentExclusionFilter = settings->value("currentExclusionFilter");
d->m_exclusionSetting = currentExclusionFilter.isValid() ? currentExclusionFilter.toString() d->m_exclusionSetting = currentExclusionFilter.isValid() ? currentExclusionFilter.toString()

2
src/plugins/texteditor/findinfiles.cpp
View File

@@ -220,7 +220,7 @@ void FindInFiles::writeSettings(QSettings *settings)
void FindInFiles::readSettings(QSettings *settings) void FindInFiles::readSettings(QSettings *settings)
{ {
settings->beginGroup(QLatin1String("FindInFiles")); settings->beginGroup(QLatin1String("FindInFiles"));
readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*"); readCommonSettings(settings, "*.cpp,*.h", "*/.git/*,*/.cvs/*,*/.svn/*,*.autosave");
settings->endGroup(); settings->endGroup();
} }