Merge branch 'master' into google

[mdictionary] / trunk / src / base / gui / SearchBarWidget.cpp

diff --git a/trunk/src/base/gui/SearchBarWidget.cpp b/trunk/src/base/gui/SearchBarWidget.cpp
index b8c823a..4f4f84a 100644 (file)
--- a/trunk/src/base/gui/SearchBarWidget.cpp
+++ b/trunk/src/base/gui/SearchBarWidget.cpp
@@ -49,7 +49,7 @@ SearchBarWidget::SearchBarWidget(QWidget *parent) :
             this, SIGNAL(historyPrev()));
 
     connect(historyShowToolButton, SIGNAL(clicked()),
-            this, SIGNAL(historyShow()));
+            this, SLOT(showHistoryButtonClicked()));
 
     connect(clearSearchWordToolButton, SIGNAL(clicked()),
             this, SLOT(clearSearchWordToolButtonClicked()));
@@ -303,3 +303,13 @@ void SearchBarWidget::updateHistoryButtons(bool prev, bool next, bool list) {
         historyShowToolButton->setEnabled(list);
     }
 }
+
+void SearchBarWidget::showHistoryButtonClicked() {
+    #ifndef Q_WS_MAEMO_5
+        QPoint p = historyShowToolButton->pos();
+        p.setY(p.y());
+        emit historyShow(mapToGlobal(p));
+    #else
+        emit historyShow();
+    #endif
+}