feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mime types: Fix that some QML files were opened as C++

Browse Source 
We registered a mime type "application/x-qml" conflicting with "text/x-
qml" from freedesktop.org.xml. The magic matcher of the C++ mime types
might kick in, in that case.

Task-number: QTCREATORBUG-13994
Change-Id: I5900c233b42681d7b7d3af185d6ff3e1c4166e59
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-02-24 09:53:55 +01:00
parent 53de7045ae
commit 4e53c23b4b
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmljstools/QmlJSTools.mimetypes.xml
View File

@@ -1,32 +1,33 @@
<?xml version="1.0"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-qml">
<alias type="text/x-qml"/>
<mime-type type="text/x-qml">
<alias type="application/x-qml"/>
<!-- sub class is missing in the freedesktop.org definition -->
<sub-class-of type="text/plain"/>
<comment>QML file</comment>
<glob pattern="*.qml"/>
</mime-type>
<mime-type type="application/x-qt.qbs+qml">
<alias type="text/x-qt.qbs+qml"/>
<sub-class-of type="application/x-qml"/>
<sub-class-of type="text/x-qml"/>
<comment>Qt Build Suite file</comment>
<glob pattern="*.qbs"/>
</mime-type>
<mime-type type="application/x-qt.ui+qml">
<alias type="text/x-qt.ui+qml"/>
<sub-class-of type="application/x-qml"/>
<sub-class-of type="text/x-qml"/>
<comment>QtQuick Designer ui file</comment>
<glob pattern="*.ui.qml"/>
</mime-type>
<mime-type type="application/x-qmlproject">
<alias type="text/x-qmlproject"/>
<sub-class-of type="application/x-qml"/>
<sub-class-of type="text/x-qml"/>
<comment>Qt Creator Qt UI project file</comment>
<glob pattern="*.qmlproject"/>
</mime-type>
<mime-type type="application/x-qt.meta-info+qml">
<alias type="text/x-qt.meta-info+qml"/>
<sub-class-of type="application/x-qml"/>
<sub-class-of type="text/x-qml"/>
<comment>QML file</comment>
<glob pattern="*.qmltypes"/>
</mime-type>

2
src/plugins/qmljstools/qmljstoolsconstants.h
View File

@@ -36,7 +36,7 @@
namespace QmlJSTools {
namespace Constants {
const char QML_MIMETYPE[] = "application/x-qml"; // separate def also in projectexplorerconstants.h
const char QML_MIMETYPE[] = "text/x-qml"; // separate def also in projectexplorerconstants.h
const char QBS_MIMETYPE[] = "application/x-qt.qbs+qml";
const char QMLPROJECT_MIMETYPE[] = "application/x-qmlproject";
const char QMLTYPES_MIMETYPE[] = "application/x-qt.meta-info+qml";