diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-21 14:50:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-25 06:00:49 +0000 |
| commit | e8e46ab553bce9aac9adcaf2ac4ee1207b69ac93 (patch) | |
| tree | 32bf7963c0d7d71309b62026e01f8586fffe5aee /src/plugins/glsleditor | |
| parent | 5df0f97d2f4f90decbc2fb263704755857416846 (diff) | |
Plugins: Fix that mimetype definition was not valid JSON
JSON officially does not support multiline strings, so we should use
the same mechanism that we already use for the plugin description
(i.e. additionally support arrays of strings which are interpreted
as lines).
This just happens to work because Qt's JSON parser eats it without
choking.
Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/glsleditor')
| -rw-r--r-- | src/plugins/glsleditor/GLSLEditor.json.in | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/plugins/glsleditor/GLSLEditor.json.in b/src/plugins/glsleditor/GLSLEditor.json.in index 915ae7ae02..09814901a2 100644 --- a/src/plugins/glsleditor/GLSLEditor.json.in +++ b/src/plugins/glsleditor/GLSLEditor.json.in @@ -17,48 +17,48 @@ \"Url\" : \"http://www.qt.io\", $$dependencyList, - \"Mimetypes\" : \" - <?xml version=\'1.0\'?> - <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'> + \"Mimetypes\" : [ + \"<?xml version=\'1.0\'?>\", + \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\", - <mime-type type=\'application/x-glsl\'> - <alias type=\'text/x-glsl\'/> - <sub-class-of type=\'text/plain\'/> - <comment>GLSL Shader file</comment> - <glob pattern=\'*.glsl\'/> - <glob pattern=\'*.shader\'/> - </mime-type> + \" <mime-type type=\'application/x-glsl\'>\", + \" <alias type=\'text/x-glsl\'/>\", + \" <sub-class-of type=\'text/plain\'/>\", + \" <comment>GLSL Shader file</comment>\", + \" <glob pattern=\'*.glsl\'/>\", + \" <glob pattern=\'*.shader\'/>\", + \" </mime-type>\", - <mime-type type=\'text/x-glsl-frag\'> - <sub-class-of type=\'text/x-glsl\'/> - <comment>GLSL Fragment Shader file</comment> - <glob pattern=\'*.frag\'/> - </mime-type> + \" <mime-type type=\'text/x-glsl-frag\'>\", + \" <sub-class-of type=\'text/x-glsl\'/>\", + \" <comment>GLSL Fragment Shader file</comment>\", + \" <glob pattern=\'*.frag\'/>\", + \" </mime-type>\", - <mime-type type=\'text/x-glsl-es-frag\'> - <sub-class-of type=\'text/x-glsl\'/> - <comment>GLSL/ES Fragment Shader file</comment> - <glob pattern=\'*.fsh\'/> - </mime-type> + \" <mime-type type=\'text/x-glsl-es-frag\'>\", + \" <sub-class-of type=\'text/x-glsl\'/>\", + \" <comment>GLSL/ES Fragment Shader file</comment>\", + \" <glob pattern=\'*.fsh\'/>\", + \" </mime-type>\", - <mime-type type=\'text/x-glsl-vert\'> - <sub-class-of type=\'text/x-glsl\'/> - <comment>GLSL Vertex Shader file</comment> - <glob pattern=\'*.vert\'/> - </mime-type> + \" <mime-type type=\'text/x-glsl-vert\'>\", + \" <sub-class-of type=\'text/x-glsl\'/>\", + \" <comment>GLSL Vertex Shader file</comment>\", + \" <glob pattern=\'*.vert\'/>\", + \" </mime-type>\", - <mime-type type=\'text/x-glsl-es-vert\'> - <sub-class-of type=\'text/x-glsl\'/> - <comment>GLSL/ES Vertex Shader file</comment> - <glob pattern=\'*.vsh\'/> - </mime-type> + \" <mime-type type=\'text/x-glsl-es-vert\'>\", + \" <sub-class-of type=\'text/x-glsl\'/>\", + \" <comment>GLSL/ES Vertex Shader file</comment>\", + \" <glob pattern=\'*.vsh\'/>\", + \" </mime-type>\", - <mime-type type=\'text/x-glsl-es-geometry\'> - <sub-class-of type=\'text/x-glsl\'/> - <comment>GLSL/ES Geometry Shader file</comment> - <glob pattern=\'*.gsh\'/> - </mime-type> + \" <mime-type type=\'text/x-glsl-es-geometry\'>\", + \" <sub-class-of type=\'text/x-glsl\'/>\", + \" <comment>GLSL/ES Geometry Shader file</comment>\", + \" <glob pattern=\'*.gsh\'/>\", + \" </mime-type>\", - </mime-info> - \" + \"</mime-info>\" + ] } |