summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2016-12-14 15:21:28 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-15 07:01:39 +0000
commitb9d0b6933875005a5b1f17a53e29240faf4a440e (patch)
treef57a4b96f2dc67411413bd336141f5dd02752bad /configure.json
parent42cd3124cdef38545fdba5a2de37bfcad2542cad (diff)
Fix Linux audio library detection
The configure checks where moved to QtMultimedia which we do not depend on, therefore we need to now duplicate the checks ourselves. Task-number: QTBUG-57620 Change-Id: I6f7319c7e91e3f51baf012c669121389cd6e1360 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json43
1 files changed, 42 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index 63abd1db..22870a0e 100644
--- a/configure.json
+++ b/configure.json
@@ -1,14 +1,45 @@
{
"module": "webengine",
+ "testDir": "tools/qmake/config.tests",
+
"commandline": {
"options": {
+ "alsa": "boolean",
"proprietary-codecs": "boolean",
+ "pulseaudio": "boolean",
"spellchecker": "boolean"
}
},
+ "libraries": {
+ "alsa": {
+ "label": "ALSA",
+ "test": "alsa",
+ "sources": [
+ "-lasound"
+ ]
+ },
+ "pulseaudio": {
+ "label": "PulseAudio >= 0.9.10",
+ "sources": [
+ { "type": "pkgConfig", "args": "libpulse >= 0.9.10 libpulse-mainloop-glib" }
+ ]
+ }
+ },
+
"features": {
+ "alsa": {
+ "label": "ALSA",
+ "condition": "config.unix && libs.alsa",
+ "output": [ "privateFeature" ]
+ },
+ "pulseaudio": {
+ "label": "PulseAudio",
+ "autoDetect": "config.unix",
+ "condition": "libs.pulseaudio",
+ "output": [ "privateFeature" ]
+ },
"proprietary-codecs": {
"label": "Proprietary Codecs",
"autoDetect": false,
@@ -27,7 +58,17 @@
"section": "Qt WebEngine",
"entries": [
"proprietary-codecs",
- "spellchecker"
+ "spellchecker",
+ {
+ "type": "feature",
+ "args": "alsa",
+ "condition": "config.unix"
+ },
+ {
+ "type": "feature",
+ "args": "pulseaudio",
+ "condition": "config.unix"
+ }
]
}
]