Use new mime database

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

2 files changed, 10 insertions, 12 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 0176b4eb2c..71e48493f3 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -37,10 +37,11 @@
 
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/mimedatabase.h>
 
 #include <qtsupport/qtsupportconstants.h>
 
+#include <utils/mimetypes/mimedatabase.h>
+
 #include <QtPlugin>
 
 #include <QApplication>
@@ -58,18 +59,14 @@ QmlProjectPlugin::~QmlProjectPlugin()
 
 bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
 {
-    using namespace Core;
-
-    const QLatin1String mimetypesXml(":/qmlproject/QmlProjectManager.mimetypes.xml");
-
-    if (!MimeDatabase::addMimeTypes(mimetypesXml, errorMessage))
-        return false;
+    Q_UNUSED(errorMessage)
+    Utils::MimeDatabase::addMimeTypes(QLatin1String(":/qmlproject/QmlProjectManager.mimetypes.xml"));
 
     addAutoReleasedObject(new Internal::Manager);
     addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);
     addAutoReleasedObject(new Internal::QmlApplicationWizard);
 
-    FileIconProvider::registerIconOverlayForSuffix(":/qmlproject/images/qmlproject.png", "qmlproject");
+    Core::FileIconProvider::registerIconOverlayForSuffix(":/qmlproject/images/qmlproject.png", "qmlproject");
     return true;
 }
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 46c9dffece..5ba76147ce 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -33,7 +33,6 @@
 #include "qmlprojectmanagerconstants.h"
 #include "qmlprojectrunconfigurationwidget.h"
 #include "qmlprojectenvironmentaspect.h"
-#include <coreplugin/mimedatabase.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icore.h>
@@ -43,6 +42,7 @@
 #include <qtsupport/qtsupportconstants.h>
 
 #include <utils/fileutils.h>
+#include <utils/mimetypes/mimedatabase.h>
 #include <utils/qtcprocess.h>
 #include <utils/winutils.h>
 
@@ -264,22 +264,23 @@ void QmlProjectRunConfiguration::changeCurrentFile(IEditor *editor)
 void QmlProjectRunConfiguration::updateEnabled()
 {
     bool qmlFileFound = false;
+    Utils::MimeDatabase mdb;
     if (mainScriptSource() == FileInEditor) {
         IDocument *document = EditorManager::currentDocument();
         if (document) {
             m_currentFileFilename = document->filePath().toString();
-            if (MimeDatabase::findByFile(mainScript()).type() == QLatin1String("application/x-qml"))
+            if (mdb.mimeTypeForFile(mainScript()).matchesName(QLatin1String("application/x-qml")))
                 qmlFileFound = true;
         }
         if (!document
-                || MimeDatabase::findByFile(mainScript()).type() == QLatin1String("application/x-qmlproject")) {
+                || mdb.mimeTypeForFile(mainScript()).matchesName(QLatin1String("application/x-qmlproject"))) {
             // find a qml file with lowercase filename. This is slow, but only done
             // in initialization/other border cases.
             foreach (const QString &filename, target()->project()->files(Project::AllFiles)) {
                 const QFileInfo fi(filename);
 
                 if (!filename.isEmpty() && fi.baseName()[0].isLower()
-                        && MimeDatabase::findByFile(fi).type() == QLatin1String("application/x-qml"))
+                        && mdb.mimeTypeForFile(fi).matchesName(QLatin1String("application/x-qml")))
                 {
                     m_currentFileFilename = filename;
                     qmlFileFound = true;