aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/help/searchwidget.h
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2014-10-31 14:20:03 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2014-11-04 07:57:08 +0100
commitcd5e00034d7cc9bd11d26f4cbde91e2db2c12383 (patch)
tree56dfa1d2719f9afbb28af01d44d836cbe4c9ebf7 /src/plugins/help/searchwidget.h
parentd6a7287fb40121951d3d93296eed011c2b598832 (diff)
Help: Fix highlighting of search terms.
It was using the wrong search help engine to get the search terms. Instead let the search widget itself figure out the search terms, and pass it directly on to the help widget when activating links. Change-Id: Ib72220eafca69e92894fe7584b1e4dfd9a42cc7e Task-number: QTCREATORBUG-13239 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/help/searchwidget.h')
-rw-r--r--src/plugins/help/searchwidget.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h
index 58cc403687b..802efc957af 100644
--- a/src/plugins/help/searchwidget.h
+++ b/src/plugins/help/searchwidget.h
@@ -57,7 +57,7 @@ public:
QList<QToolButton *> createToolBarWidgets();
signals:
- void linkActivated(const QUrl &url, bool newPage);
+ void linkActivated(const QUrl &url, const QStringList &searchTerms, bool newPage);
};
class SearchWidget : public QWidget
@@ -77,7 +77,7 @@ public slots:
void reindexDocumentation();
signals:
- void linkActivated(const QUrl &link, bool newPage);
+ void linkActivated(const QUrl &link, const QStringList &searchTerms, bool newPage);
protected:
void showEvent(QShowEvent *event);
@@ -94,6 +94,7 @@ private slots:
private:
bool eventFilter(QObject* o, QEvent *e);
void contextMenuEvent(QContextMenuEvent *contextMenuEvent);
+ QStringList currentSearchTerms() const;
private:
int zoomCount;