diff options
| author | con <qtc-committer@nokia.com> | 2009-01-27 16:46:54 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-01-27 16:55:55 +0100 |
| commit | d22f833a9c08c36b075916dc1cd715d80f9c1039 (patch) | |
| tree | 959de1afda59b5fdb0dc62206e0aeee70a934314 | |
| parent | d8005df09a94783def1597000a20be1574a475be (diff) | |
| download | qt-creator-d22f833a9c08c36b075916dc1cd715d80f9c1039.tar.gz | |
Fixes: - Avoid some annoying debug output.
Details: - No stupid "true" and "namespace bla already registered"
output anymore.
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 9e07f46f69..3eddaa5e0e 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -98,7 +98,7 @@ void HelpManager::registerDocumentation(const QStringList &fileNames) } } if (needsSetup) - qDebug() << m_helpEngine->setupData(); + m_helpEngine->setupData(); } HelpPlugin::HelpPlugin() : @@ -450,9 +450,12 @@ void HelpPlugin::extensionsInitialized() #endif QHelpEngineCore hc(fi.absoluteFilePath()); hc.setupData(); - if (!hc.registerDocumentation(qchFileName)) - qDebug() << hc.error(); - needsSetup = true; + QString fileNamespace = QHelpEngineCore::namespaceName(qchFileName); + if (!fileNamespace.isEmpty() && !hc.registeredDocumentations().contains(fileNamespace)) { + if (!hc.registerDocumentation(qchFileName)) + qDebug() << hc.error(); + needsSetup = true; + } } int i = m_helpEngine->customValue( |
