Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@973966 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 5 deletions

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 0e312e04..283453a8 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -113,13 +113,14 @@ void FindBar::clear()
 }
 
 
-void FindBar::showFindBar()
+void FindBar::show()
 {
     // show findbar if not visible
-    if (!isVisible())
-    {
-        show();
-    }
+    if (isVisible())
+        return;
+
+    QWidget::show();
+
     // set focus to findbar if user select showFindBar shortcut
     m_lineEdit->setFocus();
     m_lineEdit->selectAll();