diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-12-12 09:44:13 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-12-12 09:44:13 +0100 |
| commit | 9084ca73dff77d3df8ce564a19016dfeb482ea6d (patch) | |
| tree | d2adbbe2b307fd51c9dd347cc5cd4be7f9fe9203 /src/plugins/texteditor/findinfiles.cpp | |
| parent | 1a2a278eec7a8438006246f47932d614804e3894 (diff) | |
| parent | 5cd4a73acab1ee3782747d5de55c0ae734bfba2f (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: I87f47cecbb924064296a002fd9446a0627acad8e
Diffstat (limited to 'src/plugins/texteditor/findinfiles.cpp')
| -rw-r--r-- | src/plugins/texteditor/findinfiles.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 41fde3bb26..19c226e326 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -218,7 +218,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(); } |