summaryrefslogtreecommitdiffstats
path: root/src/multimedia/configure.json
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-03-31 16:11:55 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2017-04-03 07:37:36 +0000
commitba120a9ba02232d713f8495403158ef06a8e67d4 (patch)
treef63b7cf859d0e947d0d8b2117951103e352b6836 /src/multimedia/configure.json
parent6c3b0fdb5ceb9079241cb7136d756e9dba114cfe (diff)
Remove newlines from JSON strings
Newlines in strings are not allowed by the JSON standard. Change-Id: I0ee0b699f0b1157443662028605689931681abcd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/configure.json')
-rw-r--r--src/multimedia/configure.json9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json
index 20a809b2b..4f0532ad4 100644
--- a/src/multimedia/configure.json
+++ b/src/multimedia/configure.json
@@ -225,20 +225,17 @@
},
"gstreamer_app": {
"label": "GStreamer App",
- "condition": "(features.gstreamer_1_0 && libs.gstreamer_app_1_0)
- || (features.gstreamer_0_10 && libs.gstreamer_app_0_10)",
+ "condition": "(features.gstreamer_1_0 && libs.gstreamer_app_1_0) || (features.gstreamer_0_10 && libs.gstreamer_app_0_10)",
"output": [ "privateFeature" ]
},
"gstreamer_encodingprofiles": {
"label": "GStreamer encoding-profile.h",
- "condition": "(features.gstreamer_1_0 && tests.gstreamer_encodingprofiles_1_0)
- || (features.gstreamer_0_10 && tests.gstreamer_encodingprofiles_0_10)",
+ "condition": "(features.gstreamer_1_0 && tests.gstreamer_encodingprofiles_1_0) || (features.gstreamer_0_10 && tests.gstreamer_encodingprofiles_0_10)",
"output": [ "privateFeature" ]
},
"gstreamer_photography": {
"label": "GStreamer Photography",
- "condition": "(features.gstreamer_1_0 && libs.gstreamer_photography_1_0)
- || (features.gstreamer_0_10 && libs.gstreamer_photography_0_10)",
+ "condition": "(features.gstreamer_1_0 && libs.gstreamer_photography_1_0) || (features.gstreamer_0_10 && libs.gstreamer_photography_0_10)",
"output": [ "privateFeature" ]
},
"gpu_vivante": {