diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/multimedia/audio | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
| download | qtmultimedia-e964e89331f2cfef99a3f63172a127b6c02a9727.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/audio.pri | 5 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index d6d74a316..388124205 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -41,13 +41,10 @@ SOURCES += \ audio/qaudiohelpers.cpp qtConfig(pulseaudio) { - QMAKE_USE += pulseaudio - - DEFINES += QT_MULTIMEDIA_PULSEAUDIO + QMAKE_USE_FOR_PRIVATE += 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 <QtMultimedia/private/qtmultimediaglobal_p.h> #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 |