diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-06-13 16:55:06 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@digia.com> | 2014-06-19 15:34:06 +0200 |
| commit | eb75bf8e3bde3a9b3efc91b54aa4dc2e34a3cde4 (patch) | |
| tree | 8e732844e13e38d2ab95a8a1fb14edbcc3cd98e8 /src/plugins/plugins.pro | |
| parent | d691f5ca2b6749006673e199b1d668a6daa9b990 (diff) | |
Enable both PulseAudio and Alsa plugins on Linux.
It was previously only one or the other, and all Qt packages for linux
were only including the PulseAudio backend.
Now, both will be included; if PulseAudio is available it will be used
by default, otherwise it will fall back to Alsa.
Change-Id: I393c7728ec9741b1b58681608c184cd1b92126b1
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 2677e269b..88fc203d5 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -36,11 +36,8 @@ unix:!mac:!android { SUBDIRS += audiocapture } - config_pulseaudio { - SUBDIRS += pulseaudio - } else:config_alsa { - SUBDIRS += alsa - } + config_pulseaudio: SUBDIRS += pulseaudio + config_alsa: SUBDIRS += alsa # v4l is turned off because it is not supported in Qt 5 # !maemo*:SUBDIRS += v4l |