From b70081ae7117f0b7eca21547c720682a4ba50cf1 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 2 Mar 2015 21:43:32 +0200
Subject: [PATCH] QtSupport: Register mimetype for qm and ts files

ts appears in freedesktop, but it is ambiguous.

Change-Id: Iacc1386551f79eb885c03db7329f592394428f66
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
---
 src/plugins/qtsupport/QtSupport.mimetypes.xml | 14 ++++++++++++++
 src/plugins/qtsupport/qtsupport.qrc           |  1 +
 src/plugins/qtsupport/qtsupportplugin.cpp     |  4 ++++
 3 files changed, 19 insertions(+)
 create mode 100644 src/plugins/qtsupport/QtSupport.mimetypes.xml

diff --git a/src/plugins/qtsupport/QtSupport.mimetypes.xml b/src/plugins/qtsupport/QtSupport.mimetypes.xml
new file mode 100644
index 00000000000..21c20bebfc1
--- /dev/null
+++ b/src/plugins/qtsupport/QtSupport.mimetypes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/x-linguist-translation">
+    <comment>Linguist translated messages (machine-readable)</comment>
+    <glob pattern="*.qm"/>
+  </mime-type>
+  <mime-type type="application/x-linguist">
+    <comment>Linguist message catalog</comment>
+    <magic>
+      <match value="&lt;TS" type="string" offset="0:256"/>
+    </magic>
+    <glob pattern="*.ts" weight="70"/>
+  </mime-type>
+</mime-info>
diff --git a/src/plugins/qtsupport/qtsupport.qrc b/src/plugins/qtsupport/qtsupport.qrc
index 02b4ae28513..e97078e35bf 100644
--- a/src/plugins/qtsupport/qtsupport.qrc
+++ b/src/plugins/qtsupport/qtsupport.qrc
@@ -8,5 +8,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>
     </qresource>
 </RCC>
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 7fdcea8b4db..8de3090decf 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -50,7 +50,9 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/target.h>
+
 #include <utils/macroexpander.h>
+#include <utils/mimetypes/mimedatabase.h>
 
 #include <QtPlugin>
 
@@ -69,6 +71,8 @@ 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);