From e8e46ab553bce9aac9adcaf2ac4ee1207b69ac93 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 21 Jul 2017 14:50:23 +0200
Subject: 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>
---
 src/plugins/imageviewer/ImageViewer.json.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/plugins/imageviewer')

diff --git a/src/plugins/imageviewer/ImageViewer.json.in b/src/plugins/imageviewer/ImageViewer.json.in
index 685dff9a9f..59fa5f7282 100644
--- a/src/plugins/imageviewer/ImageViewer.json.in
+++ b/src/plugins/imageviewer/ImageViewer.json.in
@@ -17,15 +17,15 @@
     \"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=\'image/webp\'>
-            <comment>WebP Image file</comment>
-            <glob pattern=\'*.webp\'/>
-        </mime-type>
+        \"    <mime-type type=\'image/webp\'>\",
+        \"        <comment>WebP Image file</comment>\",
+        \"        <glob pattern=\'*.webp\'/>\",
+        \"    </mime-type>\",
 
-    </mime-info>
-    \"
+        \"</mime-info>\"
+    ]
 }
-- 
cgit v1.2.3