Commit 9aaf2ec8 authored by kh1's avatar kh1
Browse files

Remove the register call for the qml file, I put it into help module.

parent 0521722b
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <texteditor/textfilewizard.h> #include <texteditor/textfilewizard.h>
#include <texteditor/texteditoractionhandler.h> #include <texteditor/texteditoractionhandler.h>
#include <texteditor/completionsupport.h> #include <texteditor/completionsupport.h>
#include <help/helpmanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
...@@ -151,27 +150,6 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e ...@@ -151,27 +150,6 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
void QmlJSEditorPlugin::extensionsInitialized() void QmlJSEditorPlugin::extensionsInitialized()
{ {
//
// 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 without a qt development version.
//
ExtensionSystem::PluginManager *pluginManager = ExtensionSystem::PluginManager::instance();
Help::HelpManager *helpManager = pluginManager->getObject<Help::HelpManager>();
Q_ASSERT(helpManager);
const QString qmlHelpFile =
QDir::cleanPath(QCoreApplication::applicationDirPath()
#if defined(Q_OS_MAC)
+ QLatin1String("/../Resources/doc/qml.qch"));
#else
+ QLatin1String("../../share/doc/qtcreator/qml.qch"));
#endif
helpManager->registerDocumentation(QStringList(qmlHelpFile));
} }
void QmlJSEditorPlugin::initializeEditor(QmlJSEditor::Internal::QmlJSTextEditor *editor) void QmlJSEditorPlugin::initializeEditor(QmlJSEditor::Internal::QmlJSTextEditor *editor)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment