close tab order chain the the embedded find toolbar

2 files changed, 16 insertions, 0 deletions

diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp
index 6a28c4d93c..f87d9bf9e0 100644
--- a/src/plugins/find/findtoolbar.cpp
+++ b/src/plugins/find/findtoolbar.cpp
@@ -481,3 +481,16 @@ void FindToolBar::openFind()
     m_currentDocumentFind->highlightAll(getFindText(), m_plugin->findFlags());
     selectFindText();
 }
+
+
+bool FindToolBar::focusNextPrevChild(bool next)
+{
+    // close tab order change
+    if (next && m_ui.replaceAllButton->hasFocus())
+        m_ui.findEdit->setFocus(Qt::TabFocusReason);
+    else if (!next && m_ui.findEdit->hasFocus())
+        m_ui.replaceAllButton->setFocus(Qt::TabFocusReason);
+    else
+        return QToolBar::focusNextPrevChild(next);
+    return true;
+}
diff --git a/src/plugins/find/findtoolbar.h b/src/plugins/find/findtoolbar.h
index 790a1e0300..4eeb4f8a2d 100644
--- a/src/plugins/find/findtoolbar.h
+++ b/src/plugins/find/findtoolbar.h
@@ -79,6 +79,9 @@ private slots:
     void updateActions();
     void findFlagsChanged();
 
+protected:
+    bool focusNextPrevChild(bool next);
+
 private:
     bool setFocusToCurrentFindSupport();