diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-09-19 18:02:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-19 18:02:46 +0200 |
| commit | b947861c59abc087af2af06f208d5ee0646724c4 (patch) | |
| tree | 72942f37b361dd6fc5f6ae2ec99c37903c254362 /src/plugins/help/helpplugin.cpp | |
| parent | c0321ac305b8768eab1061c14ab83af0a3796f98 (diff) | |
| parent | 44177392ec332fd55e96f52c27b4c4c6ec0011bd (diff) | |
| download | qt-creator-b947861c59abc087af2af06f208d5ee0646724c4.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.qbp
src/libs/QtcLibrary.qbs
src/plugins/QtcPlugin.qbs
src/tools/QtcTool.qbs
Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
Diffstat (limited to 'src/plugins/help/helpplugin.cpp')
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index e6d7bc11d3..d2b80ac884 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -195,6 +195,8 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) SLOT(setupHelpEngineIfNeeded())); connect(Core::HelpManager::instance(), SIGNAL(collectionFileChanged()), this, SLOT(setupHelpEngineIfNeeded())); + connect(Core::HelpManager::instance(), SIGNAL(setupFinished()), this, + SLOT(unregisterOldQtCreatorDocumentation())); m_splitter = new Core::MiniSplitter; m_centralWidget = new Help::Internal::CentralWidget(); @@ -386,16 +388,6 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) void HelpPlugin::extensionsInitialized() { - const QString &nsInternal = QString::fromLatin1("com.nokia.qtcreator.%1%2%3") - .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE); - - Core::HelpManager *helpManager = Core::HelpManager::instance(); - foreach (const QString &ns, helpManager->registeredNamespaces()) { - if (ns.startsWith(QLatin1String("com.nokia.qtcreator.")) - && ns != nsInternal) - helpManager->unregisterDocumentation(QStringList() << ns); - } - QStringList filesToRegister; // Explicitly register qml.qch if located in creator directory. This is only // needed for the creator-qml package, were we want to ship the documentation @@ -407,7 +399,7 @@ void HelpPlugin::extensionsInitialized() // we might need to register creators inbuild help filesToRegister.append(QDir::cleanPath(appPath + QLatin1String(DOCPATH "qtcreator.qch"))); - helpManager->registerDocumentation(filesToRegister); + Core::HelpManager::instance()->registerDocumentation(filesToRegister); } ExtensionSystem::IPlugin::ShutdownFlag HelpPlugin::aboutToShutdown() @@ -429,6 +421,23 @@ ExtensionSystem::IPlugin::ShutdownFlag HelpPlugin::aboutToShutdown() return SynchronousShutdown; } +void HelpPlugin::unregisterOldQtCreatorDocumentation() +{ + const QString &nsInternal = QString::fromLatin1("com.nokia.qtcreator.%1%2%3") + .arg(IDE_VERSION_MAJOR).arg(IDE_VERSION_MINOR).arg(IDE_VERSION_RELEASE); + + Core::HelpManager *helpManager = Core::HelpManager::instance(); + QStringList documentationToUnregister; + foreach (const QString &ns, helpManager->registeredNamespaces()) { + if (ns.startsWith(QLatin1String("com.nokia.qtcreator.")) + && ns != nsInternal) { + documentationToUnregister << ns; + } + } + if (!documentationToUnregister.isEmpty()) + helpManager->unregisterDocumentation(documentationToUnregister); +} + void HelpPlugin::setupUi() { // side bar widgets and shortcuts |