diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:13:55 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:15:07 +0100 |
| commit | d3dd527c3715188e2708ebcf5189076cbff9b104 (patch) | |
| tree | 4a5c2a4e34d142c3a0cb690216a0d5df39708242 /configure.json | |
| parent | 3bb1294bc59320e5699840e14490197d6a77b7aa (diff) | |
| parent | e2609bcba621110920d847fcfbaf7edec4ae3827 (diff) | |
Merge branch '5.8' into dev
Conflicts:
configure.json
Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/configure.json b/configure.json index a6aae977a..7f5f46f72 100644 --- a/configure.json +++ b/configure.json @@ -1,13 +1,33 @@ { "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" } + ] + } + }, + "tests" : { "ninja": { "label": "system ninja", @@ -20,6 +40,17 @@ }, "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, @@ -50,7 +81,17 @@ "proprietary-codecs", "spellchecker", "system-gn", - "system-ninja" + "system-ninja", + { + "type": "feature", + "args": "alsa", + "condition": "config.unix" + }, + { + "type": "feature", + "args": "pulseaudio", + "condition": "config.unix" + } ] } ] |