summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-02-09 15:50:20 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-05-08 11:12:23 +0000
commit6c18b2085e9d738b48a5bec3bdc9c96db2e7e4d7 (patch)
treea47576a87a2ae8f088ef9eac4ffa26945c4130f2 /src/multimedia
parent960fbf083be4391314e8fe36994a133763dbbe7d (diff)
de-duplicate gstreamer_encodingprofiles configure tests
take advantage of the system now supporting 'use' by exported name. Change-Id: I7879d4c2e31b279bbbe17916e805ee60c108351d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/configure.json12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json
index 4f0532ad..e250f2b9 100644
--- a/src/multimedia/configure.json
+++ b/src/multimedia/configure.json
@@ -137,16 +137,10 @@
"type": "compile",
"test": "evr"
},
- "gstreamer_encodingprofiles_1_0": {
- "label": "GStreamer encoding-profile.h",
- "type": "compile",
- "use": "gstreamer_1_0",
- "test": "gstreamer_encodingprofiles"
- },
- "gstreamer_encodingprofiles_0_10": {
+ "gstreamer_encodingprofiles": {
"label": "GStreamer encoding-profile.h",
"type": "compile",
- "use": "gstreamer_0_10",
+ "use": "gstreamer",
"test": "gstreamer_encodingprofiles"
},
"gpu_vivante": {
@@ -230,7 +224,7 @@
},
"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 && tests.gstreamer_encodingprofiles",
"output": [ "privateFeature" ]
},
"gstreamer_photography": {