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

Proposed by Maxim Ermilov
Status: Rejected
Rejected by: Maxim Ermilov
Proposed branch: lp:~zaspire/ubuntu-qtcreator-plugins/fix-1213969
Merge into: lp:ubuntu-qtcreator-plugins
Diff against target: 31 lines (+11/-1)
2 files modified
qtcreator-2.7.1/debian/Nokia-QtCreator.xml (+10/-0)
qtcreator-2.7.1/debian/qtcreator.desktop (+1/-1)
To merge this branch: bzr merge lp:~zaspire/ubuntu-qtcreator-plugins/fix-1213969
Reviewer Review Type Date Requested Status
Ubuntu SDK team Pending
Review via email: mp+181691@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Unmerged revisions

272. By Maxim Ermilov

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
11 <comment xml:lang="en">Qt Resource File</comment>11 <comment xml:lang="en">Qt Resource File</comment>
12 <glob pattern="*.qrc"/>12 <glob pattern="*.qrc"/>
13 </mime-type> 13 </mime-type>
14 <mime-type type="application/x-ubuntuproject">
15 <sub-class-of type="application/x-qml"/>
16 <comment>Ubuntu Project file</comment>
17 <glob pattern="*.ubuntuproject"/>
18 </mime-type>
19 <mime-type type="application/x-cordovaproject">
20 <sub-class-of type="application/x-qml"/>
21 <comment>Cordova Ubuntu Project file</comment>
22 <glob pattern="*.cordovaproject"/>
23 </mime-type>
14 24
15</mime-info>25</mime-info>
1626
=== 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 @@
5Terminal=false5Terminal=false
6Name=Qt Creator6Name=Qt Creator
7GenericName=Integrated Development Environment7GenericName=Integrated Development Environment
8MimeType=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;8MimeType=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;
9Categories=Qt;Development;IDE;9Categories=Qt;Development;IDE;
10InitialPreference=910InitialPreference=9

Subscribers

People subscribed via source and target branches

to all changes: