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

Fixes: - Move help collection also to qtcreator subdir.

Browse Source
This commit is contained in:
con
2009-01-06 18:10:33 +01:00
parent 123ef3db8e
commit 2e064af15d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cpphoverhandler.cpp
View File

@@ -72,10 +72,16 @@ CppHoverHandler::CppHoverHandler(QObject *parent)
m_modelManager = m_core->pluginManager()->getObject<CppTools::CppModelManagerInterface>(); m_modelManager = m_core->pluginManager()->getObject<CppTools::CppModelManagerInterface>();
QFileInfo fi(ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->settings()->fileName()); 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); + QLatin1String("/helpcollection.qhc"), this);
//m_helpEngine->setAutoSaveFilter(false); //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_helpEngine->setCurrentFilter(tr("Unfiltered"));
m_helpEngineNeedsSetup = m_helpEngine->registeredDocumentations().count() == 0; m_helpEngineNeedsSetup = m_helpEngine->registeredDocumentations().count() == 0;

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

@@ -83,7 +83,8 @@ void HelpManager::registerDocumentation(const QStringList &fileNames)
bool needsSetup = false; bool needsSetup = false;
{ {
QHelpEngineCore hc(m_helpEngine->collectionFile()); QHelpEngineCore hc(m_helpEngine->collectionFile());
hc.setupData(); if (!hc.setupData())
qWarning() << "Could not initialize help engine:" << hc.error();
foreach (const QString &fileName, fileNames) { foreach (const QString &fileName, fileNames) {
if (!QFile::exists(fileName)) if (!QFile::exists(fileName))
continue; 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? // FIXME shouldn't the help engine create the directory if it doesn't exist?
QFileInfo fi(m_core->settings()->fileName()); QFileInfo fi(m_core->settings()->fileName());
QDir directory(fi.absolutePath()); QDir directory(fi.absolutePath()+"/qtcreator");
if (!directory.exists()) if (!directory.exists())
directory.mkpath(directory.absolutePath()); directory.mkpath(directory.absolutePath());
m_helpEngine = new QHelpEngine(directory.absolutePath() m_helpEngine = new QHelpEngine(directory.absolutePath()