From eb75bf8e3bde3a9b3efc91b54aa4dc2e34a3cde4 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Fri, 13 Jun 2014 16:55:06 +0200
Subject: [PATCH] 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>
---
 src/plugins/plugins.pro | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 2677e269..88fc203d 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