Commit 12889af0 authored by Tobias Hunger's avatar Tobias Hunger

Move C++ mime types from cppeditor to cpptools

Have the mimetypes and their registration in the same plugin
as their constants.

Change-Id: I350ab4eb0da3941ca9282ff98d8d0e158b568ef3
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent 2c60cb2e
......@@ -2,7 +2,6 @@
<qresource prefix="/cppeditor">
<file>images/qt_cpp.png</file>
<file>images/qt_h.png</file>
<file>CppEditor.mimetypes.xml</file>
<file>images/qt_c.png</file>
<file>images/dark_qt_cpp.png</file>
<file>images/dark_qt_h.png</file>
......
......@@ -141,7 +141,6 @@ CppQuickFixAssistProvider *CppEditorPlugin::quickFixProvider() const
bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
Q_UNUSED(errorMessage)
Utils::MimeDatabase::addMimeTypes(QLatin1String(":/cppeditor/CppEditor.mimetypes.xml"));
addAutoReleasedObject(new CppEditorFactory);
addAutoReleasedObject(new CppOutlineWidgetFactory);
......
<RCC>
<qresource prefix="/cpptools">
<file>images/category_cpp.png</file>
<file>CppTools.mimetypes.xml</file>
</qresource>
</RCC>
......@@ -140,6 +140,8 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
Q_UNUSED(arguments)
Q_UNUSED(error)
Utils::MimeDatabase::addMimeTypes(QLatin1String(":/cpptools/CppTools.mimetypes.xml"));
CppModelManager::instance()->setParent(this);
m_settings = new CppToolsSettings(this); // force registration of cpp tools settings
......
Markdown is supported
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