From 4d69ccb738944dbcb3765bd6af1b37a8d4764614 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Tue, 28 May 2013 16:37:27 +0200
Subject: [PATCH] Remove Nokia leftovers take 2

Change-Id: Ib5fb8e81204d3454c2972a272f3abe4c22274f7a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/plugins/cvs/CVS.mimetypes.xml                           | 2 +-
 .../genericprojectmanager/GenericProject.mimetypes.xml      | 6 +++---
 src/plugins/perforce/Perforce.mimetypes.xml                 | 2 +-
 src/plugins/subversion/Subversion.mimetypes.xml             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/cvs/CVS.mimetypes.xml b/src/plugins/cvs/CVS.mimetypes.xml
index 237d8aa67c0..f227093ecba 100644
--- a/src/plugins/cvs/CVS.mimetypes.xml
+++ b/src/plugins/cvs/CVS.mimetypes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="application/vnd.nokia.text.cvs.submit">
+    <mime-type type="text/vnd.qtcreator.cvs.submit">
         <comment>CVS submit template</comment>
         <sub-class-of type="text/plain"/>
     </mime-type>
diff --git a/src/plugins/genericprojectmanager/GenericProject.mimetypes.xml b/src/plugins/genericprojectmanager/GenericProject.mimetypes.xml
index c45a828b200..76e0449a70e 100644
--- a/src/plugins/genericprojectmanager/GenericProject.mimetypes.xml
+++ b/src/plugins/genericprojectmanager/GenericProject.mimetypes.xml
@@ -7,19 +7,19 @@
     <glob pattern="*.creator"/>
   </mime-type>
 
-  <mime-type type="application/vnd.nokia.qt.generic.files">
+  <mime-type type="application/vnd.qtcreator.generic.files">
     <sub-class-of type="text/plain"/>
     <comment>Generic Project Files</comment>
     <glob pattern="*.files"/>
   </mime-type>
 
-  <mime-type type="application/vnd.nokia.qt.generic.includes">
+  <mime-type type="application/vnd.qtcreator.generic.includes">
     <sub-class-of type="text/plain"/>
     <comment>Generic Project Include Paths</comment>
     <glob pattern="*.includes"/>
   </mime-type>
 
-  <mime-type type="application/vnd.nokia.qt.generic.config">
+  <mime-type type="application/vnd.qtcreator.generic.config">
     <sub-class-of type="text/plain"/>
     <comment>Generic Project Configuration File</comment>
     <glob pattern="*.config"/>
diff --git a/src/plugins/perforce/Perforce.mimetypes.xml b/src/plugins/perforce/Perforce.mimetypes.xml
index 3c2d3327710..d65e3d017f4 100644
--- a/src/plugins/perforce/Perforce.mimetypes.xml
+++ b/src/plugins/perforce/Perforce.mimetypes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="application/vnd.nokia.text.p4.submit">
+    <mime-type type="text/vnd.qtcreator.p4.submit">
         <comment>Perforce submit template</comment>
         <sub-class-of type="text/plain"/>
         <magic priority="50">
diff --git a/src/plugins/subversion/Subversion.mimetypes.xml b/src/plugins/subversion/Subversion.mimetypes.xml
index 6aa0c3eda9b..a3372413642 100644
--- a/src/plugins/subversion/Subversion.mimetypes.xml
+++ b/src/plugins/subversion/Subversion.mimetypes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-    <mime-type type="application/vnd.nokia.text.subversion.submit">
+    <mime-type type="text/vnd.qtcreator.svn.submit">
         <comment>Subversion submit template</comment>
         <sub-class-of type="text/plain"/>
     </mime-type>