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

Merge remote-tracking branch 'origin/master' into 4.4

Browse Source 
Change-Id: I00fe351ee5f2689366c63ba94b042609c47da777
This commit is contained in:
Eike Ziller
2017-07-04 13:55:35 +02:00
parent ccef9c0294 3c6a2b7912
commit 526e40cba3
68 changed files with 733 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cpptools/symbolsfindfilter.cpp
View File

@@ -100,11 +100,6 @@ void SymbolsFindFilter::setPaused(bool paused)
watcher->setPaused(paused);
}
FindFlags SymbolsFindFilter::supportedFindFlags() const
{
return FindCaseSensitively | FindRegularExpression | FindWholeWords;
}
void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags)
{
SearchResultWindow *window = SearchResultWindow::instance();

1
src/plugins/cpptools/symbolsfindfilter.h
View File

@@ -56,7 +56,6 @@ public:
QString id() const;
QString displayName() const;
bool isEnabled() const;
Core::FindFlags supportedFindFlags() const;
void findAll(const QString &txt, Core::FindFlags findFlags);