diff options
| author | ck <qt-info@nokia.com> | 2009-11-06 16:21:17 +0100 |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2009-11-06 16:21:17 +0100 |
| commit | d57933fe2c74907c6256aef82374fefd55adee05 (patch) | |
| tree | 0993b2b5e5892c6a46ad8546d317d4befa3b06a4 /tools | |
| parent | c059c6f2add4a500121c19b0c95d0c57196285ba (diff) | |
Assistant: Fixes related to search configuration.
1. Remove superfluous definition of QT_CLUCENE_SUPPORT
in assistant.pro. It was not evaluated anywhere.
2. Bugfix for searvh widget when working with non-CLucene search lib.
Reviewed-by: kh1
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/tools/assistant/assistant.pro | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/searchwidget.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro index 1cbd1d32db..1a7e874b02 100644 --- a/tools/assistant/tools/assistant/assistant.pro +++ b/tools/assistant/tools/assistant/assistant.pro @@ -4,8 +4,6 @@ TEMPLATE = app LANGUAGE = C++ TARGET = assistant -DEFINES += QT_CLUCENE_SUPPORT - contains(QT_CONFIG, webkit) { QT += webkit } diff --git a/tools/assistant/tools/assistant/searchwidget.cpp b/tools/assistant/tools/assistant/searchwidget.cpp index 48fa8c6ba4..3b456a38a3 100644 --- a/tools/assistant/tools/assistant/searchwidget.cpp +++ b/tools/assistant/tools/assistant/searchwidget.cpp @@ -85,7 +85,8 @@ SearchWidget::SearchWidget(QHelpSearchEngine *engine, QWidget *parent) SLOT(searchingFinished(int))); QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget); - browser->viewport()->installEventFilter(this); + if (browser) // Will be null if lib was configured not to use CLucene. + browser->viewport()->installEventFilter(this); } SearchWidget::~SearchWidget() |