From 2e064af15da78b670cec3d270b947aece50b578a Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Tue, 6 Jan 2009 18:10:33 +0100
Subject: [PATCH] Fixes: - Move help collection also to qtcreator subdir.
---
src/plugins/cppeditor/cpphoverhandler.cpp | 10 ++++++++--
src/plugins/help/helpplugin.cpp | 5 +++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index ba97e5a212a..6ebf51b2a2c 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -72,10 +72,16 @@ CppHoverHandler::CppHoverHandler(QObject *parent)
m_modelManager = m_core->pluginManager()->getObject<CppTools::CppModelManagerInterface>();
QFileInfo fi(ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->settings()->fileName());
- m_helpEngine = new QHelpEngineCore(fi.absolutePath()
+ // FIXME shouldn't the help engine create the directory if it doesn't exist?
+ QDir directory(fi.absolutePath()+"/qtcreator");
+ if (!directory.exists())
+ directory.mkpath(directory.absolutePath());
+
+ m_helpEngine = new QHelpEngineCore(directory.absolutePath()
+ QLatin1String("/helpcollection.qhc"), this);
//m_helpEngine->setAutoSaveFilter(false);
- m_helpEngine->setupData();
+ if (!m_helpEngine->setupData())
+ qWarning() << "Could not initialize help engine:" << m_helpEngine->error();
m_helpEngine->setCurrentFilter(tr("Unfiltered"));
m_helpEngineNeedsSetup = m_helpEngine->registeredDocumentations().count() == 0;
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index bdc98b66ee1..5ecb375240d 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -83,7 +83,8 @@ void HelpManager::registerDocumentation(const QStringList &fileNames)
bool needsSetup = false;
{
QHelpEngineCore hc(m_helpEngine->collectionFile());
- hc.setupData();
+ if (!hc.setupData())
+ qWarning() << "Could not initialize help engine:" << hc.error();
foreach (const QString &fileName, fileNames) {
if (!QFile::exists(fileName))
continue;
@@ -132,7 +133,7 @@ bool HelpPlugin::initialize(const QStringList & /*arguments*/, QString *)
// FIXME shouldn't the help engine create the directory if it doesn't exist?
QFileInfo fi(m_core->settings()->fileName());
- QDir directory(fi.absolutePath());
+ QDir directory(fi.absolutePath()+"/qtcreator");
if (!directory.exists())
directory.mkpath(directory.absolutePath());
m_helpEngine = new QHelpEngine(directory.absolutePath()
--
GitLab