From d22f833a9c08c36b075916dc1cd715d80f9c1039 Mon Sep 17 00:00:00 2001 From: con <qtc-committer@nokia.com> Date: Tue, 27 Jan 2009 16:46:54 +0100 Subject: [PATCH] Fixes: - Avoid some annoying debug output. Details: - No stupid "true" and "namespace bla already registered" output anymore. --- src/plugins/help/helpplugin.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 9e07f46f69f..3eddaa5e0ec 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( -- GitLab