From cf267527ca9acfe8a18fea25747efad7fef9a5f9 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 3 Feb 2017 14:19:51 +0300 Subject: Make pulseaudio dependency private Otherwise projects that depend on multimedia module fail to build. Change-Id: I44a614fd3b2bea934149f8bf55eaeb17069258d5 Reviewed-by: Oswald Buddenhagen --- src/multimedia/audio/audio.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/multimedia/audio') diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index d6d74a316..202d8b110 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -41,7 +41,7 @@ SOURCES += \ audio/qaudiohelpers.cpp qtConfig(pulseaudio) { - QMAKE_USE += pulseaudio + QMAKE_USE_FOR_PRIVATE += pulseaudio DEFINES += QT_MULTIMEDIA_PULSEAUDIO PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h -- cgit v1.2.1 From 95de9e6154d75688e81a3b79007dfe6c56d3b65b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 21 Nov 2016 10:44:47 +0100 Subject: Use QT_CONFIG macro to check for features And remove many custom defines. Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29 Reviewed-by: Yoann Lopes --- src/multimedia/audio/audio.pri | 3 --- src/multimedia/audio/qsoundeffect.cpp | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/multimedia/audio') diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index 202d8b110..388124205 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -42,12 +42,9 @@ SOURCES += \ qtConfig(pulseaudio) { QMAKE_USE_FOR_PRIVATE += pulseaudio - - DEFINES += QT_MULTIMEDIA_PULSEAUDIO PRIVATE_HEADERS += audio/qsoundeffect_pulse_p.h SOURCES += audio/qsoundeffect_pulse_p.cpp } else { - DEFINES += QT_MULTIMEDIA_QAUDIO PRIVATE_HEADERS += audio/qsoundeffect_qaudio_p.h SOURCES += audio/qsoundeffect_qaudio_p.cpp } diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index f8b8d7b18..556ba1193 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -37,11 +37,12 @@ ** ****************************************************************************/ +#include #include "qsoundeffect.h" -#if defined(QT_MULTIMEDIA_PULSEAUDIO) +#if QT_CONFIG(pulseaudio) #include "qsoundeffect_pulse_p.h" -#elif(QT_MULTIMEDIA_QAUDIO) +#else #include "qsoundeffect_qaudio_p.h" #endif -- cgit v1.2.1