diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:09:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:09:08 +0200 |
| commit | 1fd79bfd906de6e630f813417fced24cfca97f4b (patch) | |
| tree | 3f2c970c162b127d518800381bde96cf1e982145 /src/multimedia | |
| parent | 684456d8fbdb80d621e3c4838544c2878e3f2a43 (diff) | |
| parent | 021e8989308fba30425e7a0f34f4e176a8aa3ccf (diff) | |
| download | qtmultimedia-1fd79bfd906de6e630f813417fced24cfca97f4b.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I06cd631ca9d3b6b2ed5709a7697a26b9eb7171d1
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/configure.json | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index 2d51102f5..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": { @@ -275,7 +272,6 @@ }, "wasapi": { "label": "Windows Audio Services", - "autoDetect": "false", "condition": "config.win32 && tests.wasapi", "output": [ "privateFeature" ] }, @@ -319,6 +315,7 @@ "resourcepolicy", "mmrenderer", "avfoundation", + "wasapi", "directshow", "wmf", { |