feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix locator crash.

Browse Source 
Task-number: QTCREATORBUG-3991
Reviewed-by: kh
This commit is contained in:
kh1
2011-03-16 15:20:02 +01:00
parent a7370ae4b0
commit e00d6c1aba
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/helpmanager.cpp
View File

@@ -239,9 +239,13 @@ QStringList HelpManager::findKeywords(const QString &key, int maxHits) const
DbCleaner cleaner(name); DbCleaner cleaner(name);
QSqlDatabase db = QSqlDatabase::addDatabase(sqlite, name); QSqlDatabase db = QSqlDatabase::addDatabase(sqlite, name);
if (db.driver() && db.driver()->lastError().type() == QSqlError::NoError) { 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) { foreach (const QString &nameSpace, registeredDocs) {
db.setDatabaseName(d->m_helpEngine->documentationFileName(nameSpace)); db.setDatabaseName(core.documentationFileName(nameSpace));
if (db.open()) { if (db.open()) {
QSqlQuery query = QSqlQuery(db); QSqlQuery query = QSqlQuery(db);
query.setForwardOnly(true); query.setForwardOnly(true);