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>

6 files changed, 11 insertions, 19 deletions

diff --git a/src/plugins/subversion/Subversion.json.in b/src/plugins/subversion/Subversion.json.in
index 55db2399eb..a31c9dd38b 100644
--- a/src/plugins/subversion/Subversion.json.in
+++ b/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>
+    \"
 }
diff --git a/src/plugins/subversion/Subversion.mimetypes.xml b/src/plugins/subversion/Subversion.mimetypes.xml
deleted file mode 100644
index a337241364..0000000000
--- a/src/plugins/subversion/Subversion.mimetypes.xml
+++ /dev/null
@@ -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>
diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index ebf878474b..90b0481532 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/src/plugins/subversion/subversion.pro
@@ -20,5 +20,3 @@ SOURCES += annotationhighlighter.cpp \
     subversionsettings.cpp
 
 FORMS += settingspage.ui
-
-RESOURCES += subversion.qrc
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 1a6244a946..cd1b03f440 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
         "settingspage.cpp",
         "settingspage.h",
         "settingspage.ui",
-        "subversion.qrc",
         "subversionclient.cpp",
         "subversionclient.h",
         "subversionconstants.h",
diff --git a/src/plugins/subversion/subversion.qrc b/src/plugins/subversion/subversion.qrc
deleted file mode 100644
index b23e6dbb97..0000000000
--- a/src/plugins/subversion/subversion.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/trolltech.subversion">
-        <file>Subversion.mimetypes.xml</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 6346fa0e8a..aaf43d9195 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -56,7 +56,6 @@
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
-#include <utils/mimetypes/mimedatabase.h>
 #include <utils/parameteraction.h>
 #include <utils/qtcassert.h>
 #include <utils/synchronousprocess.h>
@@ -215,8 +214,6 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
 
     m_subversionPluginInstance = this;
 
-    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/trolltech.subversion/Subversion.mimetypes.xml"));
-
     m_client = new SubversionClient;
 
     addAutoReleasedObject(new SettingsPage(versionControl()));