diff options
author | dt <qtc-committer@nokia.com> | 2009-10-21 15:10:27 +0200 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2009-11-24 14:41:33 +0100 |
commit | 7f72a2bcb876c910c9c71e91da8d71a6f7f6d597 (patch) | |
tree | dfefbd7ccd2d1be49b7572b9cb67c92e2cb3f317 | |
parent | d6b770586d9b13eae66d33c550c5aba8009541a3 (diff) |
Fix a bug with selecting copying the right text to the Find dialog.
To reproduce:
Split editors.
Select text in first editor.
Select text in second editor.
Invoke the find dialog.
Notice that the text from the first editor was used.
Reviewed-By: mae
(cherry picked from commit fd0fbddebbf8b78398cc4d26e3bb36b8c445a307)
-rw-r--r-- | src/plugins/find/findplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp index 518ced182f..03a51a94a9 100644 --- a/src/plugins/find/findplugin.cpp +++ b/src/plugins/find/findplugin.cpp @@ -135,6 +135,8 @@ void FindPlugin::openFindFilter() QAction *action = qobject_cast<QAction*>(sender()); QTC_ASSERT(action, return); IFindFilter *filter = action->data().value<IFindFilter *>(); + if (m_currentDocumentFind->candidateIsEnabled()) + m_currentDocumentFind->acceptCandidate(); QString currentFindString = (m_currentDocumentFind->isEnabled() ? m_currentDocumentFind->currentFindString() : ""); if (!currentFindString.isEmpty()) m_findDialog->setFindText(currentFindString); |