summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorJames McDonnell <jmcdonnell@blackberry.com>2017-02-21 15:31:06 -0500
committerJames McDonnell <jmcdonnell@blackberry.com>2017-02-27 17:40:10 +0000
commited8f90d0e47bd4ade7be3852627395ac66ba32ea (patch)
tree47292c1a0c275a6b221423ee3cd2b5b2b620cc25 /src/multimedia
parentb6299347cc5cf4a9e4f79e2a4a8bb389260264df (diff)
Disable the ALSA plugin for QNX
The QNX ALSA implementation isn't compatible with the generic ALSA plugin. QNX has its own ALSA plugin. The old configure system didn't test for ALSA support on QNX, but the new configure system does test for it. A porting error. With an official QNX SDP, this isn't a problem, because the ALSA headers aren't in the expected location, so the test fails. With some QNX internal SDPs though, the ALSA headers are in the expected location, so the test succeeds. Change-Id: Id62aa4c17c683397545bf42fc5b741f25b719360 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/configure.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json
index 8fb2eb868..4af05b79d 100644
--- a/src/multimedia/configure.json
+++ b/src/multimedia/configure.json
@@ -178,7 +178,7 @@
"features": {
"alsa": {
"label": "ALSA",
- "condition": "config.unix && libs.alsa",
+ "condition": "config.unix && !config.qnx && libs.alsa",
"output": [ "feature", "privateFeature" ]
},
"avfoundation": {