summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-03-03 09:34:44 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-03-03 10:48:38 (GMT)
commit9957e85e37345e946ecc67196d65fbca867a2001 (patch)
tree28cab06981744a00ef4ba9154ae9ad658384f600 /src
parent7a6f492a6dcf9140eda309dcdff6e0f8d321df19 (diff)
downloadQt-9957e85e37345e946ecc67196d65fbca867a2001.zip
Qt-9957e85e37345e946ecc67196d65fbca867a2001.tar.gz
Qt-9957e85e37345e946ecc67196d65fbca867a2001.tar.bz2
Add config.test for multimedia/qml
using pkg-config from pri file is not good for cross-compiling Reviewed-by: paul
Diffstat (limited to 'src')
-rw-r--r--src/multimedia/qml/qml.pri20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/multimedia/qml/qml.pri b/src/multimedia/qml/qml.pri
index d0ff71d..d7aef1a 100644
--- a/src/multimedia/qml/qml.pri
+++ b/src/multimedia/qml/qml.pri
@@ -2,15 +2,17 @@
contains(QT_CONFIG, declarative) {
QT += declarative
- 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