Merge lp:~zaspire/ubuntu-qtcreator-plugins/fix-1213969 into lp:ubuntu-qtcreator-plugins

[Maxim Ermilov]

add application/x-ubuntuproject;application/x-cordovaproject; to Nokia-QtCreator.xml & qtcreator.desktop

Unmerged revisions

272. By Maxim Ermilov on 2013-08-23

add application/x-ubuntuproject;application/x-cordovaproject; to Nokia-QtCreator.xml & qtcreator.desktop

=== modified file 'qtcreator-2.7.1/debian/Nokia-QtCreator.xml'
--- qtcreator-2.7.1/debian/Nokia-QtCreator.xml	2013-06-12 09:40:28 +0000
+++ qtcreator-2.7.1/debian/Nokia-QtCreator.xml	2013-08-23 02:41:30 +0000
@@ -11,5 +11,15 @@
     <comment xml:lang="en">Qt Resource File</comment>
     <glob pattern="*.qrc"/>
   </mime-type> 
+  <mime-type type="application/x-ubuntuproject">
+    <sub-class-of type="application/x-qml"/>
+    <comment>Ubuntu Project file</comment>
+    <glob pattern="*.ubuntuproject"/>
+  </mime-type>
+  <mime-type type="application/x-cordovaproject">
+    <sub-class-of type="application/x-qml"/>
+    <comment>Cordova Ubuntu Project file</comment>
+    <glob pattern="*.cordovaproject"/>
+  </mime-type>
   
 </mime-info>

=== modified file 'qtcreator-2.7.1/debian/qtcreator.desktop'
--- qtcreator-2.7.1/debian/qtcreator.desktop	2013-06-28 14:46:39 +0000
+++ qtcreator-2.7.1/debian/qtcreator.desktop	2013-08-23 02:41:30 +0000
@@ -5,6 +5,6 @@
 Terminal=false
 Name=Qt Creator
 GenericName=Integrated Development Environment
-MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;
+MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.nokia.qt.qmakeprofile;application/vnd.nokia.xml.qt.resource;application/x-ubuntuproject;application/x-cordovaproject;
 Categories=Qt;Development;IDE;
 InitialPreference=9