From e00d6c1aba843108e62355eb7816a591ef76fc70 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 16 Mar 2011 15:20:02 +0100
Subject: [PATCH] Fix locator crash.

Task-number: QTCREATORBUG-3991
Reviewed-by: kh
---
 src/plugins/coreplugin/helpmanager.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/coreplugin/helpmanager.cpp b/src/plugins/coreplugin/helpmanager.cpp
index 776b077aa11..f933c472a97 100644
--- a/src/plugins/coreplugin/helpmanager.cpp
+++ b/src/plugins/coreplugin/helpmanager.cpp
@@ -239,9 +239,13 @@ QStringList HelpManager::findKeywords(const QString &key, int maxHits) const
     DbCleaner cleaner(name);
     QSqlDatabase db = QSqlDatabase::addDatabase(sqlite, name);
     if (db.driver() && db.driver()->lastError().type() == QSqlError::NoError) {
-        const QStringList &registeredDocs = d->m_helpEngine->registeredDocumentations();
+        QHelpEngineCore core(collectionFilePath());
+        core.setAutoSaveFilter(false);
+        core.setCurrentFilter(tr("Unfiltered"));
+        core.setupData();
+        const QStringList &registeredDocs = core.registeredDocumentations();
         foreach (const QString &nameSpace, registeredDocs) {
-            db.setDatabaseName(d->m_helpEngine->documentationFileName(nameSpace));
+            db.setDatabaseName(core.documentationFileName(nameSpace));
             if (db.open()) {
                 QSqlQuery query = QSqlQuery(db);
                 query.setForwardOnly(true);
-- 
GitLab