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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
hjk
2009-01-27 17:11:56 +01:00
parent e3b273bb8f d22f833a9c
commit 4b9f407845
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ void HelpManager::registerDocumentation(const QStringList &fileNames)
} }
} }
if (needsSetup) if (needsSetup)
qDebug() << m_helpEngine->setupData(); m_helpEngine->setupData();
} }
HelpPlugin::HelpPlugin() : HelpPlugin::HelpPlugin() :
@@ -450,9 +450,12 @@ void HelpPlugin::extensionsInitialized()
#endif #endif
QHelpEngineCore hc(fi.absoluteFilePath()); QHelpEngineCore hc(fi.absoluteFilePath());
hc.setupData(); hc.setupData();
if (!hc.registerDocumentation(qchFileName)) QString fileNamespace = QHelpEngineCore::namespaceName(qchFileName);
qDebug() << hc.error(); if (!fileNamespace.isEmpty() && !hc.registeredDocumentations().contains(fileNamespace)) {
needsSetup = true; if (!hc.registerDocumentation(qchFileName))
qDebug() << hc.error();
needsSetup = true;
}
} }
int i = m_helpEngine->customValue( int i = m_helpEngine->customValue(