Use new mime database

Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

3 files changed, 1 insertions, 75 deletions

diff --git a/src/plugins/imageviewer/ImageViewer.mimetypes.xml b/src/plugins/imageviewer/ImageViewer.mimetypes.xml
deleted file mode 100644
index f4f99a7a1cf..00000000000
--- a/src/plugins/imageviewer/ImageViewer.mimetypes.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="image/bmp">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>BMP image</comment>
-        <glob pattern="*.bmp"/>
-    </mime-type>
-    <mime-type type="image/gif">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>GIF image</comment>
-        <glob pattern="*.gif"/>
-    </mime-type>
-    <mime-type type="image/x-icon">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>ICO image</comment>
-        <glob pattern="*.ico"/>
-    </mime-type>
-    <mime-type type="image/jpeg">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>JPEG image</comment>
-        <glob pattern="*.jpg"/>
-        <glob pattern="*.jpeg"/>
-    </mime-type>
-    <mime-type type="video/x-mng">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>MNG video</comment>
-        <glob pattern="*.mng"/>
-    </mime-type>
-    <mime-type type="image/x-portable-bitmap">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>PBM image</comment>
-        <glob pattern="*.pbm"/>
-    </mime-type>
-    <mime-type type="image/x-portable-graymap">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>PGM image</comment>
-        <glob pattern="*.pgm"/>
-    </mime-type>
-    <mime-type type="image/png">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>PNG image</comment>
-        <glob pattern="*.png"/>
-    </mime-type>
-    <mime-type type="image/x-portable-pixmap">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>PPM image</comment>
-        <glob pattern="*.ppm"/>
-    </mime-type>
-    <mime-type type="image/svg+xml">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>SVG image</comment>
-        <glob pattern="*.svg"/>
-    </mime-type>
-    <mime-type type="image/tiff">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>TIFF image</comment>
-        <glob pattern="*.tif"/>
-        <glob pattern="*.tiff"/>
-    </mime-type>
-    <mime-type type="image/xbm">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>XBM image</comment>
-        <glob pattern="*.xbm"/>
-    </mime-type>
-    <mime-type type="image/xpm">
-        <sub-class-of type="application/octet-stream"/>
-        <comment>XPM image</comment>
-        <glob pattern="*.xpm"/>
-    </mime-type>
-</mime-info>
diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc
index d48561a89ef..94f8b076316 100644
--- a/src/plugins/imageviewer/imageviewer.qrc
+++ b/src/plugins/imageviewer/imageviewer.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/imageviewer">
-        <file>ImageViewer.mimetypes.xml</file>
         <file>images/outline.png</file>
         <file>images/zoomin.png</file>
         <file>images/zoomout.png</file>
diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp
index 865e3aaedea..20a1cfcf43c 100644
--- a/src/plugins/imageviewer/imageviewerplugin.cpp
+++ b/src/plugins/imageviewer/imageviewerplugin.cpp
@@ -36,7 +36,6 @@
 #include <QDebug>
 
 #include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/id.h>
 #include <extensionsystem/pluginmanager.h>
 
@@ -48,9 +47,7 @@ namespace Internal {
 bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
 {
     Q_UNUSED(arguments)
-
-    if (!Core::MimeDatabase::addMimeTypes(QLatin1String(":/imageviewer/ImageViewer.mimetypes.xml"), errorMessage))
-        return false;
+    Q_UNUSED(errorMessage)
 
     m_factory = new ImageViewerFactory(this);
     addAutoReleasedObject(m_factory);