diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:12:44 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:12:44 (GMT) |
| commit | e53480370409b96d24d3f53513e8b2019a398e70 (patch) | |
| tree | 666584367727ab15aa65b37e0b795b74f5467dba /src/multimedia | |
| parent | dead11df75ef6957a56ad83de6020a6c4e87ba16 (diff) | |
| download | Qt-e53480370409b96d24d3f53513e8b2019a398e70.zip Qt-e53480370409b96d24d3f53513e8b2019a398e70.tar.gz Qt-e53480370409b96d24d3f53513e8b2019a398e70.tar.bz2 | |
Finish to resolve merge conflict.
Move the change that were made in commit 9957e85e37345e946ecc67196d65fbca867a2001
from src/multimedia/qml/qml.pri to src/multimedia/effects/effects.pri
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/effects/effects.pri | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/effects/effects.pri index 5edd452..ff762e8 100644 --- a/src/multimedia/effects/effects.pri +++ b/src/multimedia/effects/effects.pri @@ -1,15 +1,16 @@ - -system(pkg-config --exists \'libpulse >= 0.9.10\') { - DEFINES += QT_MULTIMEDIA_PULSEAUDIO - HEADERS += $$PWD/qsoundeffect_pulse_p.h - SOURCES += $$PWD/qsoundeffect_pulse_p.cpp - LIBS += -lpulse -} else:x11 { - DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER - HEADERS += $$PWD/qsoundeffect_qmedia_p.h - SOURCES += $$PWD/qsoundeffect_qmedia_p.cpp +unix { + unix:contains(QT_CONFIG, pulseaudio) { + DEFINES += QT_MULTIMEDIA_PULSEAUDIO + HEADERS += $$PWD/qsoundeffect_pulse_p.h + SOURCES += $$PWD/qsoundeffect_pulse_p.cpp + LIBS += -lpulse + } else { + DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER + HEADERS += $$PWD/qsoundeffect_qmedia_p.h + SOURCES += $$PWD/qsoundeffect_qmedia_p.cpp + } } else { HEADERS += $$PWD/qsoundeffect_qsound_p.h SOURCES += $$PWD/qsoundeffect_qsound_p.cpp |