aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cvs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2017-07-21 14:50:23 +0200
committerEike Ziller <eike.ziller@qt.io>2017-07-25 06:00:49 +0000
commite8e46ab553bce9aac9adcaf2ac4ee1207b69ac93 (patch)
tree32bf7963c0d7d71309b62026e01f8586fffe5aee /src/plugins/cvs
parent5df0f97d2f4f90decbc2fb263704755857416846 (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/cvs')
-rw-r--r--src/plugins/cvs/CVS.json.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/cvs/CVS.json.in b/src/plugins/cvs/CVS.json.in
index d18e228f1d..1efdd73d48 100644
--- a/src/plugins/cvs/CVS.json.in
+++ b/src/plugins/cvs/CVS.json.in
@@ -17,13 +17,13 @@
\"Url\" : \"http://www.qt.io\",
$$dependencyList,
- \"Mimetypes\" : \"
- <?xml version=\'1.0\'?>
- <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>
- <mime-type type=\'text/vnd.qtcreator.cvs.submit\'>
- <comment>CVS submit template</comment>
- <sub-class-of type=\'text/plain\'/>
- </mime-type>
- </mime-info>
- \"
+ \"Mimetypes\" : [
+ \"<?xml version=\'1.0\'?>\",
+ \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\",
+ \" <mime-type type=\'text/vnd.qtcreator.cvs.submit\'>\",
+ \" <comment>CVS submit template</comment>\",
+ \" <sub-class-of type=\'text/plain\'/>\",
+ \" </mime-type>\",
+ \"</mime-info>\"
+ ]
}