summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2015-01-08 14:28:48 +0100
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-01-08 15:49:22 +0100
commit66992ebdf7d80c6fee817f786a8e0f13b80cd048 (patch)
tree44e4a332f02944d8243600a52ce9ae5788fd08f3
parent9beac6fdb35f0d0ab64c6d45b1802645b8ae6faf (diff)
Respect the pulseaudio configuration from Qt.
It was previously ignored for Desktop Linux. Change-Id: I214171d222a5e7e0ee64afde225a742adbda4adf Task-number: QTBUG-43387 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
-rw-r--r--src/core/config/desktop_linux.pri1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index 7f28cb36..57fb39f6 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -14,3 +14,4 @@ GYP_CONFIG += \
use_kerberos=0 \
use_pango=0 \
+!contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0