diff options
| author | Iain <qt-info@nokia.com> | 2009-10-21 12:45:12 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-10-21 12:45:12 (GMT) |
| commit | 1f3200b2cd25a379079700dea489901970845b0f (patch) | |
| tree | eeeab85b645f53da6e9679240b36d42bf1ef1880 /tools/assistant/lib | |
| parent | 9b6753eac7439caa2dd8915ed3616cef6d1f6cd0 (diff) | |
| parent | 522fc01a18b9eae80b733befb98a948f0fbbba06 (diff) | |
| download | Qt-1f3200b2cd25a379079700dea489901970845b0f.zip Qt-1f3200b2cd25a379079700dea489901970845b0f.tar.gz Qt-1f3200b2cd25a379079700dea489901970845b0f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtMultimediau.def
src/s60installs/eabi/QtNetworku.def
Diffstat (limited to 'tools/assistant/lib')
| -rw-r--r-- | tools/assistant/lib/qhelpsearchquerywidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/lib/qhelpsearchquerywidget.cpp b/tools/assistant/lib/qhelpsearchquerywidget.cpp index 361e9ac..f2f40ec 100644 --- a/tools/assistant/lib/qhelpsearchquerywidget.cpp +++ b/tools/assistant/lib/qhelpsearchquerywidget.cpp @@ -289,7 +289,7 @@ private slots: { QList<QHelpSearchQuery> queryList; #if !defined(QT_CLUCENE_SUPPORT) - queryList.append(QHelSearchQuery(QHelpSearchQuery::DEFAULT, + queryList.append(QHelpSearchQuery(QHelpSearchQuery::DEFAULT, QStringList(defaultQuery->text()))); #else |