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, 13 insertions, 22 deletions

diff --git a/src/plugins/imageviewer/ImageViewer.json.in b/src/plugins/imageviewer/ImageViewer.json.in
index 670f864af9..685dff9a9f 100644
--- a/src/plugins/imageviewer/ImageViewer.json.in
+++ b/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>
+    \"
 }
diff --git a/src/plugins/imageviewer/ImageViewer.mimetypes.xml b/src/plugins/imageviewer/ImageViewer.mimetypes.xml
deleted file mode 100644
index 499b38acb4..0000000000
--- a/src/plugins/imageviewer/ImageViewer.mimetypes.xml
+++ /dev/null
@@ -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>
diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro
index 651fda1fb6..a3d8182588 100644
--- a/src/plugins/imageviewer/imageviewer.pro
+++ b/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
 
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 4492e6fab3..4ec44fcbe0 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -21,7 +21,6 @@ QtcPlugin {
         "imageview.h",
         "imageviewer.cpp",
         "imageviewer.h",
-        "imageviewer.qrc",
         "imageviewerconstants.h",
         "imageviewerfactory.cpp",
         "imageviewerfactory.h",
diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc
deleted file mode 100644
index c62bf29a21..0000000000
--- a/src/plugins/imageviewer/imageviewer.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/imageviewer">
-        <file>ImageViewer.mimetypes.xml</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp
index 2193c5c43c..6d1419da44 100644
--- a/src/plugins/imageviewer/imageviewerplugin.cpp
+++ b/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;