Move mimetype definitions to plugin specs

- Avoids the hassle of QRC files and manually registering mime types
- Avoids performance regressions because of mime types that are
  registered after mime database has been used
- Makes it technically possible to detect that a disabled plugin could
  handle a mime type if it was enabled

Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>

src/plugins/android/Android.json.in

@@ -15,5 +15,16 @@
     \"Category\" : \"Device Support\",
     \"Description\" : \"Support for deployment to and execution on Android Devices.\",
     \"Url\" : \"http://necessitas.kde.org\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'application/vnd.google.android.android_manifest\'>
+            <comment>Android manifest file</comment>
+            <sub-class-of type=\'application/xml\'/>
+            <glob pattern=\'AndroidManifest.xml\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/android/Android.mimetypes.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="application/vnd.google.android.android_manifest">
-        <comment>Android manifest file</comment>
-        <sub-class-of type="application/xml"/>
-        <glob pattern="AndroidManifest.xml"/>
-    </mime-type>
-</mime-info>

src/plugins/android/android.qrc

@@ -5,6 +5,5 @@
         <file>images/androiddevicesmall.png</file>
         <file>images/androiddevicesmall@2x.png</file>
         <file>images/download.png</file>
-        <file>Android.mimetypes.xml</file>
     </qresource>
 </RCC>

src/plugins/android/androidplugin.cpp

@@ -52,8 +52,6 @@
 
 #include <qtsupport/qtversionmanager.h>
 
-#include <utils/mimetypes/mimedatabase.h>
-
 #include <QtPlugin>
 
 using namespace ProjectExplorer;
@@ -81,8 +79,6 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
     addAutoReleasedObject(new Internal::JavaEditorFactory);
     KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation);
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/android/Android.mimetypes.xml"));
-
     addAutoReleasedObject(new Internal::AndroidManifestEditorFactory);
 
     connect(KitManager::instance(), &KitManager::kitsLoaded,

src/plugins/clearcase/ClearCase.json.in

@@ -16,5 +16,15 @@
     \"Category\" : \"Version Control\",
     \"Description\" : \"ClearCase integration.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'application/vnd.audc.text.clearcase.submit\'>
+            <comment>ClearCase submit template</comment>
+            <sub-class-of type=\'text/plain\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/clearcase/clearcase.pro

@@ -31,5 +31,3 @@ FORMS += checkoutdialog.ui \
     settingspage.ui \
     undocheckout.ui \
     versionselector.ui
-
-RESOURCES += clearcase.qrc

src/plugins/clearcase/clearcase.qbs

@@ -21,7 +21,6 @@ QtcPlugin {
         "checkoutdialog.cpp",
         "checkoutdialog.h",
         "checkoutdialog.ui",
-        "clearcase.qrc",
         "clearcaseconstants.h",
         "clearcasecontrol.cpp",
         "clearcasecontrol.h",

src/plugins/clearcase/clearcase.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/clearcase">
-        <file>ClearCase.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/clearcase/clearcaseplugin.cpp

@@ -54,7 +54,6 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/iprojectmanager.h>
 #include <utils/algorithm.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/synchronousprocess.h>
 #include <utils/temporarydirectory.h>
 #include <utils/parameteraction.h>
@@ -418,8 +417,6 @@ bool ClearCasePlugin::initialize(const QStringList & /*arguments */, QString *er
     connect(ProgressManager::instance(), &ProgressManager::allTasksFinished,
             this, &ClearCasePlugin::tasksFinished);
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/clearcase/ClearCase.mimetypes.xml"));
-
     m_settings.fromSettings(ICore::settings());
 
     // update view name when changing active project

src/plugins/cmakeprojectmanager/CMakeProjectManager.json.in

@@ -15,5 +15,21 @@
     \"Category\" : \"Build Systems\",
     \"Description\" : \"CMake support.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+      <mime-type type=\'text/x-cmake\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>CMake Project file</comment>
+        <glob pattern=\'*.cmake\'/>
+      </mime-type>
+      <mime-type type=\'text/x-cmake-project\'>
+        <sub-class-of type=\'text/x-cmake\'/>
+        <comment>CMake Project file</comment>
+        <glob pattern=\'CMakeLists.txt\'/>
+      </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/cmakeprojectmanager/CMakeProjectManager.mimetypes.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-  <mime-type type="text/x-cmake">
-    <sub-class-of type="text/plain"/>
-    <comment>CMake Project file</comment>
-    <glob pattern="*.cmake"/>
-  </mime-type>
-  <mime-type type="text/x-cmake-project">
-    <sub-class-of type="text/x-cmake"/>
-    <comment>CMake Project file</comment>
-    <glob pattern="CMakeLists.txt"/>
-  </mime-type>
-</mime-info>

src/plugins/cmakeprojectmanager/cmakeproject.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/cmakeproject">
-        <file>CMakeProjectManager.mimetypes.xml</file>
         <file>images/fileoverlay_cmake.png</file>
         <file>images/fileoverlay_cmake@2x.png</file>
     </qresource>

src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp

@@ -47,7 +47,6 @@
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/projecttree.h>
 
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/parameteraction.h>
 
 using namespace CMakeProjectManager::Internal;
@@ -59,8 +58,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
     Q_UNUSED(errorMessage)
     const Context projectContext(Constants::PROJECTCONTEXT);
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":cmakeproject/CMakeProjectManager.mimetypes.xml"));
-
     Core::FileIconProvider::registerIconOverlayForSuffix(Constants::FILEOVERLAY_CMAKE, "cmake");
     Core::FileIconProvider::registerIconOverlayForFilename(Constants::FILEOVERLAY_CMAKE, "CMakeLists.txt");
 

src/plugins/coreplugin/coreplugin.cpp

@@ -46,9 +46,11 @@
 
 #include <extensionsystem/pluginerroroverview.h>
 #include <extensionsystem/pluginmanager.h>
+#include <extensionsystem/pluginspec.h>
 #include <utils/algorithm.h>
 #include <utils/pathchooser.h>
 #include <utils/macroexpander.h>
+#include <utils/mimetypes/mimedatabase.h>
 #include <utils/savefile.h>
 #include <utils/stringutils.h>
 #include <utils/theme/theme.h>
@@ -123,6 +125,17 @@ CoreArguments parseArguments(const QStringList &arguments)
 
 bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
+    // register all mime types from all plugins
+    Utils::MimeDatabase mdb;
+    for (ExtensionSystem::PluginSpec *plugin : ExtensionSystem::PluginManager::plugins()) {
+        if (!plugin->isEffectivelyEnabled())
+            continue;
+        const QJsonObject metaData = plugin->metaData();
+        const QJsonValue mimetypes = metaData.value("Mimetypes");
+        if (mimetypes.isString())
+            mdb.addMimeTypes(plugin->name() + ".mimetypes", mimetypes.toString().trimmed().toUtf8());
+    }
+
     if (ThemeEntry::availableThemes().isEmpty()) {
         *errorMessage = tr("No themes found in installation.");
         return false;

src/plugins/coreplugin/coreplugin.pro

@@ -264,7 +264,6 @@ else:unix {
         INSTALLS += image$${imagesize}
     }
 }
-DISTFILES += editormanager/BinFiles.mimetypes.xml
 
 equals(TEST, 1) {
     SOURCES += testdatadir.cpp

src/plugins/cpptools/CppTools.json.in

@@ -16,5 +16,103 @@
     \"Category\" : \"C++\",
     \"Description\" : \"Tools for analyzing C/C++ code.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\' encoding=\'UTF-8\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/x-csrc\'>
+            <comment>C source code</comment>
+            <sub-class-of type=\'text/plain\'/>
+            <alias type=\'text/x-c\'/>
+            <glob pattern=\'*.c\' case-sensitive=\'true\' weight=\'70\'/>
+        </mime-type>
+
+        <mime-type type=\'text/vnd.nvidia.cuda.csrc\'>
+            <sub-class-of type=\'text/x-csrc\'/>
+            <comment>NVIDIA CUDA C source code</comment>
+            <glob pattern=\'*.cu\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-chdr\'>
+            <comment>C header</comment>
+            <sub-class-of type=\'text/x-csrc\'/>
+            <!-- reduce weight from freedesktop to avoid conflict with text/x-c++hdr -->
+            <glob pattern=\'*.h\' weight=\'30\'/>
+        </mime-type>
+
+        <!-- Those are used to find matching headers by the CppTools plugin,
+             so, they should match -->
+        <mime-type type=\'text/x-c++hdr\'>
+            <sub-class-of type=\'text/x-chdr\'/>
+            <comment>C++ header</comment>
+            <glob pattern=\'*.hh\' weight=\'70\'/>
+            <glob pattern=\'*.hxx\' weight=\'70\'/>
+            <glob pattern=\'*.h++\' weight=\'70\'/>
+            <glob pattern=\'*.hpp\' weight=\'70\'/>
+            <glob pattern=\'*.hp\' weight=\'70\'/>
+            <!-- Additions to freedesktop: -->
+            <glob pattern=\'*.h\' weight=\'70\'/>
+            <glob pattern=\'*.H\' weight=\'70\'/>
+            <!-- Find include guards of header files without extension, for
+                 example, STL ones like <string>. Those can have a big initial
+                 comment exceeding 1000 chars, though. -->
+            <magic priority=\'50\'>
+                <match value=\'#ifndef \' type=\'string\' offset=\'0:2000\'/>
+                <match value=\'#if \' type=\'string\' offset=\'0:2000\'/>
+                <match value=\'#include \' type=\'string\' offset=\'0:2000\'/>
+            </magic>
+        </mime-type>
+
+        <mime-type type=\'text/x-c++src\'>
+            <comment>C++ source code</comment>
+            <sub-class-of type=\'text/x-csrc\'/>
+            <glob pattern=\'*.cpp\' weight=\'70\'/>
+            <glob pattern=\'*.cxx\' weight=\'70\'/>
+            <glob pattern=\'*.cc\' weight=\'70\'/>
+            <glob pattern=\'*.C\' case-sensitive=\'true\' weight=\'70\'/>
+            <glob pattern=\'*.c++\' weight=\'70\'/>
+            <!-- Additions to freedesktop: -->
+            <glob pattern=\'*.cp\' weight=\'70\'/>
+            <glob pattern=\'*.inl\' weight=\'70\'/>
+            <glob pattern=\'*.tcc\' weight=\'70\'/>
+            <glob pattern=\'*.tpp\' weight=\'70\'/>
+            <glob pattern=\'*.t++\' weight=\'70\'/>
+            <glob pattern=\'*.txx\' weight=\'70\'/>
+            <magic priority=\'30\'>
+                <match value=\'-*- C++ -*-\' type=\'string\' offset=\'0:30\'/>
+            </magic>
+        </mime-type>
+
+        <mime-type type=\'text/x-qdoc\'>
+            <comment>Qt documentation file</comment>
+            <sub-class-of type=\'text/plain\'/>
+            <glob pattern=\'*.qdoc\' weight=\'70\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-moc\'>
+            <comment>Qt MOC file</comment>
+            <!-- Fix to freedesktop: moc is C++ source -->
+            <sub-class-of type=\'text/x-c++src\'/>
+            <glob pattern=\'*.moc\' weight=\'70\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-objc++src\'>
+            <comment>Objective-C++ source code</comment>
+            <sub-class-of type=\'text/x-c++src\'/>
+            <sub-class-of type=\'text/x-objcsrc\'/>
+            <glob pattern=\'*.mm\' weight=\'70\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-objcsrc\'>
+            <comment>Objective-C source code</comment>
+            <sub-class-of type=\'text/x-csrc\'/>
+            <glob pattern=\'*.m\' weight=\'70\'/>
+            <magic priority=\'30\'>
+                <match value=\'#import\' type=\'string\' offset=\'0\'/>
+            </magic>
+        </mime-type>
+
+    </mime-info>
+    \"
 }

src/plugins/cpptools/CppTools.mimetypes.xml

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/x-csrc">
-        <comment>C source code</comment>
-        <sub-class-of type="text/plain"/>
-        <alias type="text/x-c"/>
-        <glob pattern="*.c" case-sensitive="true" weight="70"/>
-    </mime-type>
-
-    <mime-type type="text/vnd.nvidia.cuda.csrc">
-        <sub-class-of type="text/x-csrc"/>
-        <comment>NVIDIA CUDA C source code</comment>
-        <glob pattern="*.cu"/>
-    </mime-type>
-
-    <mime-type type="text/x-chdr">
-        <comment>C header</comment>
-        <sub-class-of type="text/x-csrc"/>
-        <!-- reduce weight from freedesktop to avoid conflict with text/x-c++hdr -->
-        <glob pattern="*.h" weight="30"/>
-    </mime-type>
-
-    <!-- Those are used to find matching headers by the CppTools plugin,
-         so, they should match -->
-    <mime-type type="text/x-c++hdr">
-        <sub-class-of type="text/x-chdr"/>
-        <comment>C++ header</comment>
-        <glob pattern="*.hh" weight="70"/>
-        <glob pattern="*.hxx" weight="70"/>
-        <glob pattern="*.h++" weight="70"/>
-        <glob pattern="*.hpp" weight="70"/>
-        <glob pattern="*.hp" weight="70"/>
-        <!-- Additions to freedesktop: -->
-        <glob pattern="*.h" weight="70"/>
-        <glob pattern="*.H" weight="70"/>
-        <!-- Find include guards of header files without extension, for
-             example, STL ones like <string>. Those can have a big initial
-             comment exceeding 1000 chars, though. -->
-        <magic priority="50">
-            <match value="#ifndef " type="string" offset="0:2000"/>
-            <match value="#if " type="string" offset="0:2000"/>
-            <match value="#include " type="string" offset="0:2000"/>
-        </magic>
-    </mime-type>
-
-    <mime-type type="text/x-c++src">
-        <comment>C++ source code</comment>
-        <sub-class-of type="text/x-csrc"/>
-        <glob pattern="*.cpp" weight="70"/>
-        <glob pattern="*.cxx" weight="70"/>
-        <glob pattern="*.cc" weight="70"/>
-        <glob pattern="*.C" case-sensitive="true" weight="70"/>
-        <glob pattern="*.c++" weight="70"/>
-        <!-- Additions to freedesktop: -->
-        <glob pattern="*.cp" weight="70"/>
-        <glob pattern="*.inl" weight="70"/>
-        <glob pattern="*.tcc" weight="70"/>
-        <glob pattern="*.tpp" weight="70"/>
-        <glob pattern="*.t++" weight="70"/>
-        <glob pattern="*.txx" weight="70"/>
-        <magic priority="30">
-            <match value="-*- C++ -*-" type="string" offset="0:30"/>
-        </magic>
-    </mime-type>
-
-    <mime-type type="text/x-qdoc">
-        <comment>Qt documentation file</comment>
-        <sub-class-of type="text/plain"/>
-        <glob pattern="*.qdoc" weight="70"/>
-    </mime-type>
-
-    <mime-type type="text/x-moc">
-        <comment>Qt MOC file</comment>
-        <!-- Fix to freedesktop: moc is C++ source -->
-        <sub-class-of type="text/x-c++src"/>
-        <glob pattern="*.moc" weight="70"/>
-    </mime-type>
-
-    <mime-type type="text/x-objc++src">
-        <comment>Objective-C++ source code</comment>
-        <sub-class-of type="text/x-c++src"/>
-        <sub-class-of type="text/x-objcsrc"/>
-        <glob pattern="*.mm" weight="70"/>
-    </mime-type>
-
-    <mime-type type="text/x-objcsrc">
-        <comment>Objective-C source code</comment>
-        <sub-class-of type="text/x-csrc"/>
-        <glob pattern="*.m" weight="70"/>
-        <magic priority="30">
-            <match value="#import" type="string" offset="0"/>
-        </magic>
-    </mime-type>
-
-</mime-info>

src/plugins/cpptools/cpptools.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/cpptools">
         <file>images/category_cpp.png</file>
-        <file>CppTools.mimetypes.xml</file>
     </qresource>
 </RCC>

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -140,8 +140,6 @@ 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

src/plugins/cvs/CVS.json.in

@@ -15,5 +15,15 @@
     \"Category\" : \"Version Control\",
     \"Description\" : \"CVS integration.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/vnd.qtcreator.cvs.submit\'>
+            <comment>CVS submit template</comment>
+            <sub-class-of type=\'text/plain\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/cvs/CVS.mimetypes.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/vnd.qtcreator.cvs.submit">
-        <comment>CVS submit template</comment>
-        <sub-class-of type="text/plain"/>
-    </mime-type>
-</mime-info>

src/plugins/cvs/cvs.pro

@@ -21,5 +21,3 @@ SOURCES += annotationhighlighter.cpp \
     cvsutils.cpp
 
 FORMS += settingspage.ui
-
-RESOURCES += cvs.qrc

src/plugins/cvs/cvs.qbs

@@ -13,7 +13,6 @@ QtcPlugin {
     files: [
         "annotationhighlighter.cpp",
         "annotationhighlighter.h",
-        "cvs.qrc",
         "cvsclient.cpp",
         "cvsclient.h",
         "cvscontrol.cpp",

src/plugins/cvs/cvs.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/trolltech.cvs">
-        <file>CVS.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/cvs/cvsplugin.cpp

@@ -56,7 +56,6 @@
 #include <coreplugin/locator/commandlocator.h>
 #include <coreplugin/vcsmanager.h>
 #include <utils/fileutils.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/stringutils.h>
 
 #include <QDebug>
@@ -203,8 +202,6 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     m_cvsPluginInstance = this;
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/trolltech.cvs/CVS.mimetypes.xml"));
-
     m_client = new CvsClient;
 
     addAutoReleasedObject(new SettingsPage(versionControl()));

src/plugins/debugger/Debugger.json.in

@@ -39,5 +39,22 @@
             \"Description\" : \"Event handle used for attaching to crashed processes\"
         }
     ],
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/x-asm\'>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>Assembler</comment>
+            <glob pattern=\'*.asm\'/>
+        </mime-type>
+        <!-- Catch-all for assemblers -->
+        <mime-type type=\'text/x-qtcreator-generic-asm\'>
+            <sub-class-of type=\'text/x-asm\'/>
+            <comment>Qt Creator Generic Assembler</comment>
+            <glob pattern=\'*.asm\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/debugger/Debugger.mimetypes.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/x-asm">
-        <sub-class-of type="text/plain"/>
-        <comment>Assembler</comment>
-        <glob pattern="*.asm"/>
-    </mime-type>
-    <!-- Catch-all for assemblers -->
-    <mime-type type="text/x-qtcreator-generic-asm">
-        <sub-class-of type="text/x-asm"/>
-        <comment>Qt Creator Generic Assembler</comment>
-        <glob pattern="*.asm"/>
-    </mime-type>
-</mime-info>

src/plugins/debugger/debugger.qrc

@@ -48,6 +48,5 @@
         <file>images/recordfill@2x.png</file>
         <file>images/recordoutline.png</file>
         <file>images/recordoutline@2x.png</file>
-        <file>Debugger.mimetypes.xml</file>
     </qresource>
 </RCC>

src/plugins/debugger/debuggerplugin.cpp

@@ -117,7 +117,6 @@
 #include <utils/checkablemessagebox.h>
 #include <utils/fancymainwindow.h>
 #include <utils/hostosinfo.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/proxyaction.h>
 #include <utils/qtcassert.h>
 #include <utils/savedaction.h>
@@ -1275,8 +1274,6 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
     QString *errorMessage)
 {
     Q_UNUSED(errorMessage);
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/debugger/Debugger.mimetypes.xml"));
-
     m_arguments = arguments;
     if (!m_arguments.isEmpty())
         connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::finishedInitialization,

src/plugins/genericprojectmanager/GenericProjectManager.json.in

@@ -15,5 +15,36 @@
     \"Category\" : \"Build Systems\",
     \"Description\" : \"Generic support.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+      <mime-type type=\'text/x-generic-project\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Generic Qt Creator Project file</comment>
+        <glob pattern=\'*.creator\'/>
+      </mime-type>
+
+      <mime-type type=\'application/vnd.qtcreator.generic.files\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Generic Project Files</comment>
+        <glob pattern=\'*.files\'/>
+      </mime-type>
+
+      <mime-type type=\'application/vnd.qtcreator.generic.includes\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Generic Project Include Paths</comment>
+        <glob pattern=\'*.includes\'/>
+      </mime-type>
+
+      <mime-type type=\'application/vnd.qtcreator.generic.config\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Generic Project Configuration File</comment>
+        <glob pattern=\'*.config\'/>
+      </mime-type>
+
+    </mime-info>
+    \"
 }

src/plugins/genericprojectmanager/GenericProjectManager.mimetypes.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-  <mime-type type="text/x-generic-project">
-    <sub-class-of type="text/plain"/>
-    <comment>Generic Qt Creator Project file</comment>
-    <glob pattern="*.creator"/>
-  </mime-type>
-
-  <mime-type type="application/vnd.qtcreator.generic.files">
-    <sub-class-of type="text/plain"/>
-    <comment>Generic Project Files</comment>
-    <glob pattern="*.files"/>
-  </mime-type>
-
-  <mime-type type="application/vnd.qtcreator.generic.includes">
-    <sub-class-of type="text/plain"/>
-    <comment>Generic Project Include Paths</comment>
-    <glob pattern="*.includes"/>
-  </mime-type>
-
-  <mime-type type="application/vnd.qtcreator.generic.config">
-    <sub-class-of type="text/plain"/>
-    <comment>Generic Project Configuration File</comment>
-    <glob pattern="*.config"/>
-  </mime-type>
-
-</mime-info>

src/plugins/genericprojectmanager/genericproject.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/genericproject" >
-        <file>GenericProjectManager.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/genericprojectmanager/genericprojectmanager.pro

@@ -19,7 +19,6 @@ SOURCES = genericproject.cpp \
     genericmakestep.cpp \
     genericbuildconfiguration.cpp \
     filesselectionwizardpage.cpp
-RESOURCES += genericproject.qrc
 FORMS += genericmakestep.ui
 
 equals(TEST, 1) {

src/plugins/genericprojectmanager/genericprojectmanager.qbs

@@ -27,7 +27,6 @@ QtcPlugin {
         "genericmakestep.ui",
         "genericproject.cpp",
         "genericproject.h",
-        "genericproject.qrc",
         "genericprojectconstants.h",
         "genericprojectfileseditor.cpp",
         "genericprojectfileseditor.h",

src/plugins/genericprojectmanager/genericprojectplugin.cpp

@@ -44,7 +44,6 @@
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
-#include <utils/mimetypes/mimedatabase.h>
 
 #include <QtPlugin>
 #include <QDebug>
@@ -58,7 +57,6 @@ namespace Internal {
 bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage)
 {
     Q_UNUSED(errorMessage)
-    Utils::MimeDatabase::addMimeTypes(":genericproject/GenericProjectManager.mimetypes.xml");
 
     addAutoReleasedObject(new Manager);
     addAutoReleasedObject(new ProjectFilesFactory);

src/plugins/git/Git.json.in

@@ -15,5 +15,22 @@
     \"Category\" : \"Version Control\",
     \"Description\" : \"Git integration.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/vnd.qtcreator.git.commit\'>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>Git Commit File</comment>
+            <glob pattern=\'COMMIT_MSG\'/>
+            <glob pattern=\'COMMIT_EDITMSG\'/>
+        </mime-type>
+        <mime-type type=\'text/vnd.qtcreator.git.rebase\'>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>Git Commit File</comment>
+            <glob pattern=\'git-rebase-todo\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/git/Git.mimetypes.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/vnd.qtcreator.git.commit">
-        <sub-class-of type="text/plain"/>
-        <comment>Git Commit File</comment>
-        <glob pattern="COMMIT_MSG"/>
-        <glob pattern="COMMIT_EDITMSG"/>
-    </mime-type>
-    <mime-type type="text/vnd.qtcreator.git.rebase">
-        <sub-class-of type="text/plain"/>
-        <comment>Git Commit File</comment>
-        <glob pattern="git-rebase-todo"/>
-    </mime-type>
-</mime-info>

src/plugins/git/git.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/git">
         <file>images/arrowup.png</file>
-        <file>Git.mimetypes.xml</file>
     </qresource>
 </RCC>

src/plugins/git/gitplugin.cpp

@@ -59,7 +59,6 @@
 
 #include <coreplugin/messagebox.h>
 #include <utils/asconst.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcassert.h>
 #include <utils/parameteraction.h>
 #include <utils/pathchooser.h>
@@ -99,7 +98,6 @@ namespace Git {
 namespace Internal {
 
 const unsigned minimumRequiredVersion = 0x010800;
-const char RC_GIT_MIME_XML[] = ":/git/Git.mimetypes.xml";
 
 const VcsBaseEditorParameters editorParameters[] = {
 {
@@ -642,8 +640,6 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     connect(VcsManager::instance(), &VcsManager::repositoryChanged,
             this, &GitPlugin::updateBranches, Qt::QueuedConnection);
 
-    Utils::MimeDatabase::addMimeTypes(RC_GIT_MIME_XML);
-
     /* "Gerrit" */
     m_gerritPlugin = new Gerrit::Internal::GerritPlugin(this);
     const bool ok = m_gerritPlugin->initialize(remoteRepositoryMenu);

src/plugins/glsleditor/GLSLEditor.json.in

@@ -15,5 +15,50 @@
     \"Category\" : \"Other Languages\",
     \"Description\" : \"Editor for GLSL.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+
+        <mime-type type=\'application/x-glsl\'>
+            <alias type=\'text/x-glsl\'/>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>GLSL Shader file</comment>
+            <glob pattern=\'*.glsl\'/>
+            <glob pattern=\'*.shader\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-glsl-frag\'>
+            <sub-class-of type=\'text/x-glsl\'/>
+            <comment>GLSL Fragment Shader file</comment>
+            <glob pattern=\'*.frag\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-glsl-es-frag\'>
+            <sub-class-of type=\'text/x-glsl\'/>
+            <comment>GLSL/ES Fragment Shader file</comment>
+            <glob pattern=\'*.fsh\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-glsl-vert\'>
+            <sub-class-of type=\'text/x-glsl\'/>
+            <comment>GLSL Vertex Shader file</comment>
+            <glob pattern=\'*.vert\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-glsl-es-vert\'>
+            <sub-class-of type=\'text/x-glsl\'/>
+            <comment>GLSL/ES Vertex Shader file</comment>
+            <glob pattern=\'*.vsh\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-glsl-es-geometry\'>
+            <sub-class-of type=\'text/x-glsl\'/>
+            <comment>GLSL/ES Geometry Shader file</comment>
+            <glob pattern=\'*.gsh\'/>
+        </mime-type>
+
+    </mime-info>
+    \"
 }

src/plugins/glsleditor/GLSLEditor.mimetypes.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-
-    <mime-type type="application/x-glsl">
-        <alias type="text/x-glsl"/>
-        <sub-class-of type="text/plain"/>
-        <comment>GLSL Shader file</comment>
-        <glob pattern="*.glsl"/>
-        <glob pattern="*.shader"/>
-    </mime-type>
-
-    <mime-type type="text/x-glsl-frag">
-        <sub-class-of type="text/x-glsl"/>
-        <comment>GLSL Fragment Shader file</comment>
-        <glob pattern="*.frag"/>
-    </mime-type>
-
-    <mime-type type="text/x-glsl-es-frag">
-        <sub-class-of type="text/x-glsl"/>
-        <comment>GLSL/ES Fragment Shader file</comment>
-        <glob pattern="*.fsh"/>
-    </mime-type>
-
-    <mime-type type="text/x-glsl-vert">
-        <sub-class-of type="text/x-glsl"/>
-        <comment>GLSL Vertex Shader file</comment>
-        <glob pattern="*.vert"/>
-    </mime-type>
-
-    <mime-type type="text/x-glsl-es-vert">
-        <sub-class-of type="text/x-glsl"/>
-        <comment>GLSL/ES Vertex Shader file</comment>
-        <glob pattern="*.vsh"/>
-    </mime-type>
-
-    <mime-type type="text/x-glsl-es-geometry">
-        <sub-class-of type="text/x-glsl"/>
-        <comment>GLSL/ES Geometry Shader file</comment>
-        <glob pattern="*.gsh"/>
-    </mime-type>
-
-</mime-info>

src/plugins/glsleditor/glsleditor.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/glsleditor">
-        <file>GLSLEditor.mimetypes.xml</file>
         <file>images/glslfile.png</file>
     </qresource>
 </RCC>

src/plugins/glsleditor/glsleditorplugin.cpp

@@ -46,7 +46,6 @@
 
 #include <texteditor/texteditorconstants.h>
 
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcassert.h>
 
 #include <QAction>
@@ -117,8 +116,6 @@ GlslEditorPlugin::~GlslEditorPlugin()
 
 bool GlslEditorPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
 {
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/glsleditor/GLSLEditor.mimetypes.xml"));
-
     addAutoReleasedObject(new GlslEditorFactory);
     addAutoReleasedObject(new GlslCompletionAssistProvider);
 

src/plugins/imageviewer/ImageViewer.json.in

@@ -15,5 +15,17 @@
     \"Category\" : \"Qt Creator\",
     \"Description\" : \"Image Viewer component.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+
+        <mime-type type=\'image/webp\'>
+            <comment>WebP Image file</comment>
+            <glob pattern=\'*.webp\'/>
+        </mime-type>
+
+    </mime-info>
+    \"
 }

src/plugins/imageviewer/ImageViewer.mimetypes.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-
-    <mime-type type="image/webp">
-        <comment>WebP Image file</comment>
-        <glob pattern="*.webp"/>
-    </mime-type>
-
-</mime-info>

src/plugins/imageviewer/imageviewer.pro

@@ -17,9 +17,6 @@ SOURCES += \
     imageviewer.cpp \
     imageview.cpp
 
-RESOURCES += \
-    imageviewer.qrc
-
 !isEmpty(QT.svg.name): QT += svg
 else: DEFINES += QT_NO_SVG
 

src/plugins/imageviewer/imageviewer.qbs

@@ -21,7 +21,6 @@ QtcPlugin {
         "imageview.h",
         "imageviewer.cpp",
         "imageviewer.h",
-        "imageviewer.qrc",
         "imageviewerconstants.h",
         "imageviewerfactory.cpp",
         "imageviewerfactory.h",

src/plugins/imageviewer/imageviewer.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/imageviewer">
-        <file>ImageViewer.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/imageviewer/imageviewerplugin.cpp

@@ -39,7 +39,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/id.h>
 #include <extensionsystem/pluginmanager.h>
-#include <utils/mimetypes/mimedatabase.h>
 
 namespace ImageViewer {
 namespace Internal {
@@ -51,8 +50,6 @@ bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorM
     Q_UNUSED(arguments)
     Q_UNUSED(errorMessage)
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/imageviewer/ImageViewer.mimetypes.xml"));
-
     m_factory = new ImageViewerFactory(this);
     addAutoReleasedObject(m_factory);
     return true;

src/plugins/modeleditor/ModelEditor.json.in

@@ -16,5 +16,16 @@
     \"Description\" : \"Graphical modeling with structured diagrams.\",
     \"Url\" : \"http://www.qt.io\",
     \"Experimental\" : true,
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\' encoding=\'UTF-8\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/vnd.qtcreator.model\'>
+            <sub-class-of type=\'text/xml\'/>
+            <comment>Qt Creator Model File</comment>
+            <glob pattern=\'*.qmodel\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/modeleditor/modeleditor_plugin.cpp

@@ -43,8 +43,6 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/jsexpander.h>
 
-#include <utils/mimetypes/mimedatabase.h>
-
 #include <QAction>
 #include <QApplication>
 #include <QMessageBox>
@@ -89,8 +87,6 @@ bool ModelEditorPlugin::initialize(const QStringList &arguments, QString *errorS
     Q_UNUSED(arguments);
     Q_UNUSED(errorString);
 
-    Utils::MimeDatabase::addMimeTypes(QStringLiteral(":/modeleditor/modeleditor.mimetypes.xml"));
-
     d->modelsManager = new ModelsManager(this);
     addAutoReleasedObject(d->modelsManager);
 

src/plugins/modeleditor/resources/modeleditor.mimetypes.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/vnd.qtcreator.model">
-        <sub-class-of type="text/xml"/>
-        <comment>Qt Creator Model File</comment>
-        <glob pattern="*.qmodel"/>
-    </mime-type>
-</mime-info>

src/plugins/modeleditor/resources/modeleditor.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/modeleditor">
-        <file>modeleditor.mimetypes.xml</file>
         <file>up.png</file>
     </qresource>
 </RCC>

src/plugins/nim/Nim.json.in

@@ -16,5 +16,29 @@
     \"Description\" : \"Plugin for supporting the Nim programming language.\",
     \"Url\" : \"http://www.qt.io\",
     \"Experimental\" : true,
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+
+        <mime-type type=\'text/x-nim-project\'>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>Nim project file</comment>
+            <glob pattern=\'*.nimproject\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-nim\'>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>Nim source file </comment>
+            <glob pattern=\'*.nim\'/>
+        </mime-type>
+
+        <mime-type type=\'text/x-nim-script\'>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>Nim script file </comment>
+            <glob pattern=\'*.nims\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/nim/Nim.mimetypes.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-
-    <mime-type type="text/x-nim-project">
-        <sub-class-of type="text/plain"/>
-        <comment>Nim project file</comment>
-        <glob pattern="*.nimproject"/>
-    </mime-type>
-
-    <mime-type type="text/x-nim">
-        <sub-class-of type="text/plain"/>
-        <comment>Nim source file </comment>
-        <glob pattern="*.nim"/>
-    </mime-type>
-
-    <mime-type type="text/x-nim-script">
-        <sub-class-of type="text/plain"/>
-        <comment>Nim script file </comment>
-        <glob pattern="*.nims"/>
-    </mime-type>
-</mime-info>

src/plugins/nim/nim.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>Nim.mimetypes.xml</file>
         <file>images/nim.png</file>
     </qresource>
 </RCC>

src/plugins/nim/nimplugin.cpp

@@ -42,7 +42,6 @@
 
 #include <coreplugin/fileiconprovider.h>
 #include <projectexplorer/toolchainmanager.h>
-#include <utils/mimetypes/mimedatabase.h>
 
 #include <QtPlugin>
 
@@ -69,8 +68,6 @@ bool NimPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 
     ProjectExplorer::ToolChainManager::registerLanguage(Constants::C_NIMLANGUAGE_ID, Constants::C_NIMLANGUAGE_NAME);
 
-    MimeDatabase::addMimeTypes(QLatin1String(":/Nim.mimetypes.xml"));
-
     addAutoReleasedObject(new NimSettings);
     addAutoReleasedObject(new NimSnippetProvider);
     addAutoReleasedObject(new NimEditorFactory);

src/plugins/perforce/Perforce.json.in

@@ -15,5 +15,18 @@
     \"Category\" : \"Version Control\",
     \"Description\" : \"Perforce integration.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/vnd.qtcreator.p4.submit\'>
+            <comment>Perforce submit template</comment>
+            <sub-class-of type=\'text/plain\'/>
+            <magic priority=\'50\'>
+               <match value=\'# A Perforce Change Specification.\' type=\'string\' offset=\'0\'/>
+            </magic>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/perforce/Perforce.mimetypes.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/vnd.qtcreator.p4.submit">
-        <comment>Perforce submit template</comment>
-        <sub-class-of type="text/plain"/>
-        <magic priority="50">
-           <match value="# A Perforce Change Specification." type="string" offset="0"/>
-        </magic>
-    </mime-type>
-</mime-info>

src/plugins/perforce/perforce.pro

@@ -29,5 +29,3 @@ FORMS += settingspage.ui \
     changenumberdialog.ui \
     pendingchangesdialog.ui \
     submitpanel.ui
-
-RESOURCES += perforce.qrc

src/plugins/perforce/perforce.qbs

@@ -19,7 +19,6 @@ QtcPlugin {
         "pendingchangesdialog.cpp",
         "pendingchangesdialog.h",
         "pendingchangesdialog.ui",
-        "perforce.qrc",
         "perforcechecker.cpp",
         "perforcechecker.h",
         "perforceeditor.cpp",

src/plugins/perforce/perforce.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/trolltech.perforce" >
-        <file>Perforce.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/perforce/perforceplugin.cpp

@@ -45,7 +45,6 @@
 #include <coreplugin/locator/commandlocator.h>
 #include <texteditor/textdocument.h>
 #include <utils/fileutils.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
 #include <utils/synchronousprocess.h>
@@ -186,8 +185,6 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
 
     initializeVcs(new PerforceVersionControl(this), context);
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/trolltech.perforce/Perforce.mimetypes.xml"));
-
     m_instance = this;
 
     m_settings.fromSettings(ICore::settings());

src/plugins/pythoneditor/PythonEditor.json.in

@@ -15,5 +15,21 @@
     \"Category\" : \"Other Languages\",
     \"Description\" : \"Editor and file creation wizards for Python. Example plugin for QtCreator API demonstration.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/x-python-gui\'>
+            <sub-class-of type=\'text/x-python\'/>
+            <comment>Python source file without console</comment>
+            <glob pattern=\'*.pyw\'/>
+        </mime-type>
+        <mime-type type=\'text/x-python-project\'>
+            <sub-class-of type=\'text/x-python\'/>
+            <comment>Qt Creator Python project file</comment>
+            <glob pattern=\'*.pyqtc\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/pythoneditor/PythonEditor.mimetypes.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/x-python-gui">
-        <sub-class-of type="text/x-python"/>
-        <comment>Python source file without console</comment>
-        <glob pattern="*.pyw"/>
-    </mime-type>
-    <mime-type type="text/x-python-project">
-        <sub-class-of type="text/x-python"/>
-        <comment>Qt Creator Python project file</comment>
-        <glob pattern="*.pyqtc"/>
-    </mime-type>
-</mime-info>

src/plugins/pythoneditor/pythoneditor.pro

@@ -3,9 +3,6 @@ include(../../qtcreatorplugin.pri)
 DEFINES += \
     PYTHONEDITOR_LIBRARY
 
-RESOURCES += \
-    pythoneditorplugin.qrc
-
 HEADERS += \
     pythoneditorplugin.h \
     pythoneditor.h \

src/plugins/pythoneditor/pythoneditor.qbs

@@ -17,7 +17,6 @@ QtcPlugin {
             "pythoneditor.cpp", "pythoneditor.h",
             "pythoneditorconstants.h",
             "pythoneditorplugin.cpp", "pythoneditorplugin.h",
-            "pythoneditorplugin.qrc",
             "pythonhighlighter.h", "pythonhighlighter.cpp",
             "pythonindenter.cpp", "pythonindenter.h",
             "pythonformattoken.h",

src/plugins/pythoneditor/pythoneditorplugin.cpp

@@ -52,7 +52,6 @@
 
 #include <utils/algorithm.h>
 #include <utils/detailswidget.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcprocess.h>
 #include <utils/utilsicons.h>
@@ -885,8 +884,6 @@ bool PythonEditorPlugin::initialize(const QStringList &arguments, QString *error
     Q_UNUSED(arguments)
     Q_UNUSED(errorMessage)
 
-    MimeDatabase::addMimeTypes(":/pythoneditor/PythonEditor.mimetypes.xml");
-
     addAutoReleasedObject(new PythonProjectManager);
     addAutoReleasedObject(new PythonEditorFactory);
     addAutoReleasedObject(new PythonRunConfigurationFactory);

src/plugins/pythoneditor/pythoneditorplugin.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/pythoneditor">
-        <file>PythonEditor.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/qmakeprojectmanager/QmakeProjectManager.json.in

@@ -15,5 +15,41 @@
     \"Category\" : \"Build Systems\",
     \"Description\" : \"Provides project type for Qt/QMake .pro files and tools.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+      <mime-type type=\'application/vnd.qt.qmakeprofile\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Qt Project file</comment>
+        <glob pattern=\'*.pro\'/>
+      </mime-type>
+      <mime-type type=\'application/vnd.qt.qmakeproincludefile\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Qt Project include file</comment>
+        <glob pattern=\'*.pri\'/>
+      </mime-type>
+      <mime-type type=\'application/vnd.qt.qmakeprofeaturefile\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Qt Project feature file</comment>
+        <glob pattern=\'*.prf\'/>
+      </mime-type>
+      <mime-type type=\'application/vnd.qt.qmakeproconfigurationfile\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Qt Project configuration file</comment>
+        <glob pattern=\'.qmake.conf\'/>
+      </mime-type>
+      <mime-type type=\'application/vnd.qt.qmakeprocachefile\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Qt Project cache file</comment>
+        <glob pattern=\'.qmake.cache\'/>
+      </mime-type>
+      <mime-type type=\'application/vnd.qt.qmakeprostashfile\'>
+        <sub-class-of type=\'text/plain\'/>
+        <comment>Qt Project stash file</comment>
+        <glob pattern=\'.qmake.stash\'/>
+      </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/qmakeprojectmanager/QmakeProjectManager.mimetypes.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-  <mime-type type="application/vnd.qt.qmakeprofile">
-    <sub-class-of type="text/plain"/>
-    <comment>Qt Project file</comment>
-    <glob pattern="*.pro"/>
-  </mime-type>
-  <mime-type type="application/vnd.qt.qmakeproincludefile">
-    <sub-class-of type="text/plain"/>
-    <comment>Qt Project include file</comment>
-    <glob pattern="*.pri"/>
-  </mime-type>
-  <mime-type type="application/vnd.qt.qmakeprofeaturefile">
-    <sub-class-of type="text/plain"/>
-    <comment>Qt Project feature file</comment>
-    <glob pattern="*.prf"/>
-  </mime-type>
-  <mime-type type="application/vnd.qt.qmakeproconfigurationfile">
-    <sub-class-of type="text/plain"/>
-    <comment>Qt Project configuration file</comment>
-    <glob pattern=".qmake.conf"/>
-  </mime-type>
-  <mime-type type="application/vnd.qt.qmakeprocachefile">
-    <sub-class-of type="text/plain"/>
-    <comment>Qt Project cache file</comment>
-    <glob pattern=".qmake.cache"/>
-  </mime-type>
-  <mime-type type="application/vnd.qt.qmakeprostashfile">
-    <sub-class-of type="text/plain"/>
-    <comment>Qt Project stash file</comment>
-    <glob pattern=".qmake.stash"/>
-  </mime-type>
-</mime-info>

src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/qmakeprojectmanager">
-        <file>QmakeProjectManager.mimetypes.xml</file>
         <file>images/dark_headers.png</file>
         <file>images/dark_sources.png</file>
         <file>images/dark_unknown.png</file>

src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp

@@ -58,7 +58,6 @@
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
 #include <utils/hostosinfo.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/parameteraction.h>
 
 #ifdef WITH_TESTS
@@ -83,8 +82,6 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString
     const Context projectContext(QmakeProjectManager::Constants::PROJECT_ID);
     Context projecTreeContext(ProjectExplorer::Constants::C_PROJECT_TREE);
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":qmakeprojectmanager/QmakeProjectManager.mimetypes.xml"));
-
     //create and register objects
     m_qmakeProjectManager = new QmakeManager;
     addAutoReleasedObject(m_qmakeProjectManager);

src/plugins/qmljstools/QmlJSTools.json.in

@@ -16,5 +16,47 @@
     \"Category\" : \"Qt Quick\",
     \"Description\" : \"Tools for analyzing Qml/JS code.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/x-qml\'>
+            <alias type=\'application/x-qml\'/>
+            <!-- sub class is missing in the freedesktop.org definition -->
+            <sub-class-of type=\'text/plain\'/>
+            <comment>QML file</comment>
+            <glob pattern=\'*.qml\' weight=\'70\'/>
+        </mime-type>
+        <mime-type type=\'application/x-qt.qbs+qml\'>
+            <alias type=\'text/x-qt.qbs+qml\'/>
+            <sub-class-of type=\'text/x-qml\'/>
+            <comment>Qt Build Suite file</comment>
+            <glob pattern=\'*.qbs\' weight=\'70\'/>
+        </mime-type>
+        <mime-type type=\'application/x-qt.ui+qml\'>
+            <alias type=\'text/x-qt.ui+qml\'/>
+            <sub-class-of type=\'text/x-qml\'/>
+            <comment>QtQuick Designer ui file</comment>
+            <glob pattern=\'*.ui.qml\' weight=\'70\'/>
+        </mime-type>
+        <mime-type type=\'application/x-qmlproject\'>
+            <alias type=\'text/x-qmlproject\'/>
+            <sub-class-of type=\'text/x-qml\'/>
+            <comment>Qt Creator Qt UI project file</comment>
+            <glob pattern=\'*.qmlproject\' weight=\'70\'/>
+        </mime-type>
+        <mime-type type=\'application/x-qt.meta-info+qml\'>
+            <alias type=\'text/x-qt.meta-info+qml\'/>
+            <sub-class-of type=\'text/x-qml\'/>
+            <comment>QML file</comment>
+            <glob pattern=\'*.qmltypes\' weight=\'70\'/>
+        </mime-type>
+        <mime-type type=\'application/json\'>
+            <sub-class-of type=\'text/plain\'/>
+            <comment>JSON file</comment>
+            <glob pattern=\'*.json\' weight=\'70\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/qmljstools/QmlJSTools.mimetypes.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/x-qml">
-        <alias type="application/x-qml"/>
-        <!-- sub class is missing in the freedesktop.org definition -->
-        <sub-class-of type="text/plain"/>
-        <comment>QML file</comment>
-        <glob pattern="*.qml" weight="70"/>
-    </mime-type>
-    <mime-type type="application/x-qt.qbs+qml">
-        <alias type="text/x-qt.qbs+qml"/>
-        <sub-class-of type="text/x-qml"/>
-        <comment>Qt Build Suite file</comment>
-        <glob pattern="*.qbs" weight="70"/>
-    </mime-type>
-    <mime-type type="application/x-qt.ui+qml">
-        <alias type="text/x-qt.ui+qml"/>
-        <sub-class-of type="text/x-qml"/>
-        <comment>QtQuick Designer ui file</comment>
-        <glob pattern="*.ui.qml" weight="70"/>
-    </mime-type>
-    <mime-type type="application/x-qmlproject">
-        <alias type="text/x-qmlproject"/>
-        <sub-class-of type="text/x-qml"/>
-        <comment>Qt Creator Qt UI project file</comment>
-        <glob pattern="*.qmlproject" weight="70"/>
-    </mime-type>
-    <mime-type type="application/x-qt.meta-info+qml">
-        <alias type="text/x-qt.meta-info+qml"/>
-        <sub-class-of type="text/x-qml"/>
-        <comment>QML file</comment>
-        <glob pattern="*.qmltypes" weight="70"/>
-    </mime-type>
-    <mime-type type="application/json">
-        <sub-class-of type="text/plain"/>
-        <comment>JSON file</comment>
-        <glob pattern="*.json" weight="70"/>
-    </mime-type>
-</mime-info>

src/plugins/qmljstools/qmljstools.qrc

@@ -2,6 +2,5 @@
     <qresource prefix="/qmljstools">
         <file>images/category_qml.png</file>
         <file>images/prompt.png</file>
-        <file>QmlJSTools.mimetypes.xml</file>
     </qresource>
 </RCC>

src/plugins/qmljstools/qmljstoolsplugin.cpp

@@ -38,7 +38,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <utils/mimetypes/mimedatabase.h>
 
 #include <QtPlugin>
 #include <QMenu>
@@ -68,8 +67,6 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error)
     Q_UNUSED(arguments)
     Q_UNUSED(error)
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/qmljstools/QmlJSTools.mimetypes.xml"));
-
     m_settings = new QmlJSToolsSettings(this); // force registration of qmljstools settings
 
     // Objects

src/plugins/qmlprojectmanager/QmlProjectManager.json.in

@@ -15,5 +15,17 @@
     \"Category\" : \"Qt Quick\",
     \"Description\" : \"Qt Quick support\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+      <mime-type type=\'application/x-qmlproject\'>
+        <sub-class-of type=\'text/x-qml\'/>
+        <comment>QML Project file</comment>
+        <glob pattern=\'*.qmlproject\'/>
+      </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/qmlprojectmanager/QmlProjectManager.mimetypes.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-  <mime-type type="application/x-qmlproject">
-    <sub-class-of type="text/x-qml"/>
-    <comment>QML Project file</comment>
-    <glob pattern="*.qmlproject"/>
-  </mime-type>
-</mime-info>

src/plugins/qmlprojectmanager/qmlproject.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/qmlproject">
-        <file>QmlProjectManager.mimetypes.xml</file>
         <file>images/qmlfolder.png</file>
         <file>images/qmlproject.png</file>
     </qresource>

src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

@@ -34,8 +34,6 @@
 
 #include <qtsupport/qtsupportconstants.h>
 
-#include <utils/mimetypes/mimedatabase.h>
-
 #include <QtPlugin>
 
 #include <QApplication>
@@ -54,7 +52,6 @@ QmlProjectPlugin::~QmlProjectPlugin()
 bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
 {
     Q_UNUSED(errorMessage)
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/qmlproject/QmlProjectManager.mimetypes.xml"));
 
     addAutoReleasedObject(new Internal::Manager);
     addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);

src/plugins/qtsupport/QtSupport.json.in

@@ -16,5 +16,27 @@
     \"Category\" : \"Build Systems\",
     \"Description\" : \"Provides support code for build systems.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+      <mime-type type=\'application/x-linguist-translation\'>
+        <comment>Linguist compiled translations</comment>
+        <glob pattern=\'*.qm\'/>
+      </mime-type>
+      <mime-type type=\'application/x-linguist\'>
+        <comment>Linguist source translations</comment>
+        <magic>
+          <match value=\'&lt;TS\' type=\'string\' offset=\'0:256\'/>
+        </magic>
+        <glob pattern=\'*.ts\' weight=\'70\'/>
+      </mime-type>
+      <mime-type type=\'application/scxml+xml\'>
+        <comment>SCXML State Chart</comment>
+        <sub-class-of type=\'application/xml\'/>
+        <glob pattern=\'*.scxml\'/>
+      </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/qtsupport/QtSupport.mimetypes.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-  <mime-type type="application/x-linguist-translation">
-    <comment>Linguist compiled translations</comment>
-    <glob pattern="*.qm"/>
-  </mime-type>
-  <mime-type type="application/x-linguist">
-    <comment>Linguist source translations</comment>
-    <magic>
-      <match value="&lt;TS" type="string" offset="0:256"/>
-    </magic>
-    <glob pattern="*.ts" weight="70"/>
-  </mime-type>
-  <mime-type type="application/scxml+xml">
-    <comment>SCXML State Chart</comment>
-    <sub-class-of type="application/xml"/>
-    <glob pattern="*.scxml"/>
-  </mime-type>
-</mime-info>

src/plugins/qtsupport/qtsupport.qrc

@@ -4,7 +4,6 @@
         <file>images/dark_qml.png</file>
         <file>images/dark_qt_project.png</file>
         <file>images/dark_qt_qrc.png</file>
-        <file>QtSupport.mimetypes.xml</file>
         <file>images_areaofinterest.xml</file>
         <file>qtcreator_tutorials.xml</file>
         <file>images/icons/androidapp.png</file>

src/plugins/qtsupport/qtsupportplugin.cpp

@@ -46,7 +46,6 @@
 #include <projectexplorer/target.h>
 
 #include <utils/macroexpander.h>
-#include <utils/mimetypes/mimedatabase.h>
 
 #include <QtPlugin>
 
@@ -65,8 +64,6 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes
     ProFileEvaluator::initialize();
     new ProFileCacheManager(this);
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":qtsupport/QtSupport.mimetypes.xml"));
-
     JsExpander::registerQObjectForJs(QLatin1String("QtSupport"), new CodeGenerator);
 
     addAutoReleasedObject(new QtVersionManager);

src/plugins/resourceeditor/ResourceEditor.json.in

@@ -15,5 +15,16 @@
     \"Category\" : \"Qt Creator\",
     \"Description\" : \"Editor for qrc files.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'application/vnd.qt.xml.resource\'>
+            <sub-class-of type=\'text/xml\'/>
+            <comment>Qt Resource file</comment>
+            <glob pattern=\'*.qrc\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/resourceeditor/ResourceEditor.mimetypes.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="application/vnd.qt.xml.resource">
-        <sub-class-of type="text/xml"/>
-        <comment>Qt Resource file</comment>
-        <glob pattern="*.qrc"/>
-    </mime-type>
-</mime-info>

src/plugins/resourceeditor/resourceeditor.pro

@@ -13,6 +13,4 @@ resourceeditorplugin.cpp \
 resourceeditorw.cpp \
 resourcenode.cpp
 
-RESOURCES += resourceeditor.qrc
-
 DEFINES += RESOURCE_LIBRARY

src/plugins/resourceeditor/resourceeditor.qbs

@@ -18,7 +18,6 @@ Project {
         Group {
             name: "General"
             files: [
-                "resourceeditor.qrc",
                 "resourceeditorconstants.h",
                 "resourceeditorfactory.cpp", "resourceeditorfactory.h",
                 "resourceeditorplugin.cpp", "resourceeditorplugin.h",

src/plugins/resourceeditor/resourceeditor.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/resourceeditor">
-        <file>ResourceEditor.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/resourceeditor/resourceeditorplugin.cpp

@@ -44,7 +44,6 @@
 #include <projectexplorer/projectnodes.h>
 #include <extensionsystem/pluginmanager.h>
 
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
 
@@ -121,7 +120,6 @@ bool ResourceEditorPlugin::initialize(const QStringList &arguments, QString *err
 {
     Q_UNUSED(arguments)
     Q_UNUSED(errorMessage)
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/resourceeditor/ResourceEditor.mimetypes.xml"));
 
     ResourceEditorFactory *editor = new ResourceEditorFactory(this);
     addAutoReleasedObject(editor);

src/plugins/scxmleditor/ScxmlEditor.json.in

@@ -16,5 +16,16 @@
     \"Description\" : \"Visual Editor for SCXML (State Chart XML) files.\",
     \"Url\" : \"http://www.qt.io\",
     \"Experimental\" : true,
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'application/scxml+xml\'>
+            <sub-class-of type=\'text/xml\'/>
+            <comment>SCXML file</comment>
+            <glob pattern=\'*.scxml\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/scxmleditor/ScxmlEditor.mimetypes.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="application/scxml+xml">
-        <sub-class-of type="text/xml"/>
-        <comment>SCXML file</comment>
-        <glob pattern="*.scxml"/>
-    </mime-type>
-</mime-info>

src/plugins/scxmleditor/resources.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/scxmleditor">
-        <file>ScxmlEditor.mimetypes.xml</file>
-    </qresource>
-</RCC>

src/plugins/scxmleditor/scxmleditor.pro

@@ -22,9 +22,6 @@ SOURCES += \
     scxmleditorstack.cpp \
     scxmltexteditor.cpp
 
-RESOURCES += \
-    resources.qrc
-
 include(plugin_interface/plugin_interface.pri)
 include(common/common.pri)
 include(outputpane/outputpane.pri)

src/plugins/scxmleditor/scxmleditor.qbs

@@ -30,8 +30,6 @@ QtcPlugin {
         "scxmleditorplugin.cpp", "scxmleditorplugin.h",
         "scxmleditorstack.cpp", "scxmleditorstack.h",
         "scxmltexteditor.cpp", "scxmltexteditor.h",
-
-        "resources.qrc",
     ]
 
     Group {

src/plugins/scxmleditor/scxmleditorplugin.cpp

@@ -36,7 +36,6 @@
 #include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
-#include <utils/mimetypes/mimedatabase.h>
 
 #include <QtPlugin>
 
@@ -52,7 +51,6 @@ bool ScxmlEditorPlugin::initialize(const QStringList &arguments, QString *errorS
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    Utils::MimeDatabase::addMimeTypes(":/scxmleditor/ScxmlEditor.mimetypes.xml");
     addAutoReleasedObject(new ScxmlEditorFactory);
 
     return true;

src/plugins/subversion/Subversion.json.in

@@ -15,5 +15,15 @@
     \"Category\" : \"Version Control\",
     \"Description\" : \"Subversion integration.\",
     \"Url\" : \"http://www.qt.io\",
-    $$dependencyList
+    $$dependencyList,
+
+    \"Mimetypes\" : \"
+    <?xml version=\'1.0\'?>
+    <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
+        <mime-type type=\'text/vnd.qtcreator.svn.submit\'>
+            <comment>Subversion submit template</comment>
+            <sub-class-of type=\'text/plain\'/>
+        </mime-type>
+    </mime-info>
+    \"
 }

src/plugins/subversion/Subversion.mimetypes.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="text/vnd.qtcreator.svn.submit">
-        <comment>Subversion submit template</comment>
-        <sub-class-of type="text/plain"/>
-    </mime-type>
-</mime-info>

src/plugins/subversion/subversion.pro

@@ -20,5 +20,3 @@ SOURCES += annotationhighlighter.cpp \
     subversionsettings.cpp
 
 FORMS += settingspage.ui
-
-RESOURCES += subversion.qrc