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

Remove stale entries in assistant db blocking qch file registering

Browse Source 
registerDocumentation failed if a namespace/qch file had been registered
before, but the qch file is not accessible any more. This prevented
the registration of the same namespace/qch file at a different location.

Fix this by explicitly removing entries that have no valid qch file any
more from the db.

Reviewed-by: con
This commit is contained in:
Kai Koehne
2010-01-12 13:34:44 +01:00
parent 45f8895e93
commit f0c9caf97c
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/help/helpplugin.cpp
View File

@@ -105,12 +105,23 @@ void HelpManager::registerDocumentation(const QStringList &fileNames)
if (!QFileInfo(fileName).exists()) if (!QFileInfo(fileName).exists())
continue; continue;
const QString &nameSpace = QHelpEngineCore::namespaceName(fileName); const QString &nameSpace = QHelpEngineCore::namespaceName(fileName);
if (!nameSpace.isEmpty() if (!nameSpace.isEmpty()) {
&& !hc.registeredDocumentations().contains(nameSpace)) { if (hc.registeredDocumentations().contains(nameSpace)) {
if (hc.registerDocumentation(fileName)) if (!QFileInfo(hc.documentationFileName(nameSpace)).exists()) {
// remove stale documentation path first
if (!hc.unregisterDocumentation(fileName)) {
qWarning() << "error unregistering " << fileName << hc.error();
continue;
}
} else {
continue;
}
}
if (hc.registerDocumentation(fileName)) {
needsSetup = true; needsSetup = true;
else } else {
qDebug() << "error registering" << fileName << hc.error(); qWarning() << "error registering" << fileName << hc.error();
}
} }
} }
} }