diff --git a/src/plugins/cppeditor/cppeditor.qrc b/src/plugins/cppeditor/cppeditor.qrc index e3091a0d9b6..4ce051f0d54 100644 --- a/src/plugins/cppeditor/cppeditor.qrc +++ b/src/plugins/cppeditor/cppeditor.qrc @@ -2,7 +2,6 @@ images/qt_cpp.png images/qt_h.png - CppEditor.mimetypes.xml images/qt_c.png images/dark_qt_cpp.png images/dark_qt_h.png diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index a9586e65f76..8784eaace48 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -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); diff --git a/src/plugins/cppeditor/CppEditor.mimetypes.xml b/src/plugins/cpptools/CppTools.mimetypes.xml similarity index 100% rename from src/plugins/cppeditor/CppEditor.mimetypes.xml rename to src/plugins/cpptools/CppTools.mimetypes.xml diff --git a/src/plugins/cpptools/cpptools.qrc b/src/plugins/cpptools/cpptools.qrc index d637f34c1c5..b1badb20834 100644 --- a/src/plugins/cpptools/cpptools.qrc +++ b/src/plugins/cpptools/cpptools.qrc @@ -1,5 +1,6 @@ images/category_cpp.png + CppTools.mimetypes.xml diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 364ed06fbac..6d25eade0bb 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -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