diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-21 10:44:47 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-02-27 10:30:55 +0000 |
| commit | 95de9e6154d75688e81a3b79007dfe6c56d3b65b (patch) | |
| tree | a9effd19086e8b29651414fd657d963e8de47cba /src/multimedia | |
| parent | 8d0e08e96ffd8cd78fbb4a01f250dfb46117c636 (diff) | |
Use QT_CONFIG macro to check for features
And remove many custom defines.
Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/audio.pri | 3 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 5 | ||||
| -rw-r--r-- | src/multimedia/configure.json | 2 |
3 files changed, 4 insertions, 6 deletions
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 <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 diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index d26f6f45e..e7758f0c8 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -282,7 +282,7 @@ "wmsdk": { "label": "wmsdk.h", "condition": "config.win32 && tests.wmsdk", - "output": [ "feature", "privateFeature" ] + "output": [ "privateFeature" ] }, "wshellitem": { "label": "WShellItem", |