diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-05 14:19:43 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-05 14:19:43 +0200 |
| commit | a503f8bee012839d03bbba106da2eb3312bacd9d (patch) | |
| tree | 36c6c00debfd740f43a1bf0cba1101efe00bd59f /src/plugins/qmljstools/qmljstoolsplugin.cpp | |
| parent | c770e7074ff59e394259193f5d21fee15a9d327a (diff) | |
| parent | ea3ac259d0c38a793768345cfa9197ea77d56842 (diff) | |
| download | qt-creator-a503f8bee012839d03bbba106da2eb3312bacd9d.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/libs/extensionsystem/pluginmanager.cpp
src/plugins/coreplugin/documentmanager.cpp
src/plugins/fakevim/fakevimhandler.cpp
Change-Id: Ibc2adc40bad6f10df94c50d66e78dc3f4bcb84c0
Diffstat (limited to 'src/plugins/qmljstools/qmljstoolsplugin.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmljstoolsplugin.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index 0d2889019c..50d76d8427 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -41,6 +41,7 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actioncontainer.h> +#include <coreplugin/mimedatabase.h> #include <coreplugin/progressmanager/progressmanager.h> #include <QtPlugin> @@ -72,6 +73,10 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error) Q_UNUSED(arguments) Q_UNUSED(error) + if (!Core::ICore::mimeDatabase() + ->addMimeTypes(QLatin1String(":/qmljstools/QmlJSTools.mimetypes.xml"), error)) + return false; + m_settings = new QmlJSToolsSettings(this); // force registration of qmljstools settings // Objects |