forked from qt-creator/qt-creator
Fixed adding of new file patterns to combo box in advanced find dialog
Task-Nr: QTCREATORBUG-1329
This commit is contained in:
@@ -92,7 +92,7 @@ void BaseFileFind::findAll(const QString &txt, QTextDocument::FindFlags findFlag
|
|||||||
m_isSearching = true;
|
m_isSearching = true;
|
||||||
emit changed();
|
emit changed();
|
||||||
if (m_filterCombo)
|
if (m_filterCombo)
|
||||||
updateComboEntries(m_filterCombo, false);
|
updateComboEntries(m_filterCombo, true);
|
||||||
m_watcher.setFuture(QFuture<FileSearchResult>());
|
m_watcher.setFuture(QFuture<FileSearchResult>());
|
||||||
SearchResult *result = m_resultWindow->startNewSearch();
|
SearchResult *result = m_resultWindow->startNewSearch();
|
||||||
connect(result, SIGNAL(activated(Find::SearchResultItem)), this, SLOT(openEditor(Find::SearchResultItem)));
|
connect(result, SIGNAL(activated(Find::SearchResultItem)), this, SLOT(openEditor(Find::SearchResultItem)));
|
||||||
@@ -114,7 +114,7 @@ void BaseFileFind::replaceAll(const QString &txt, QTextDocument::FindFlags findF
|
|||||||
m_isSearching = true;
|
m_isSearching = true;
|
||||||
emit changed();
|
emit changed();
|
||||||
if (m_filterCombo)
|
if (m_filterCombo)
|
||||||
updateComboEntries(m_filterCombo, false);
|
updateComboEntries(m_filterCombo, true);
|
||||||
m_watcher.setFuture(QFuture<FileSearchResult>());
|
m_watcher.setFuture(QFuture<FileSearchResult>());
|
||||||
SearchResult *result = m_resultWindow->startNewSearch(SearchResultWindow::SearchAndReplace);
|
SearchResult *result = m_resultWindow->startNewSearch(SearchResultWindow::SearchAndReplace);
|
||||||
connect(result, SIGNAL(activated(Find::SearchResultItem)), this, SLOT(openEditor(Find::SearchResultItem)));
|
connect(result, SIGNAL(activated(Find::SearchResultItem)), this, SLOT(openEditor(Find::SearchResultItem)));
|
||||||
|
|||||||
Reference in New Issue
Block a user