summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@nokia.com>2010-10-01 08:15:21 +1000
committerLorn Potter <lorn.potter@nokia.com>2010-10-01 08:15:21 +1000
commit701233b072663179256e5687aa5913d4ea63c0e1 (patch)
treeea7b9ecbc0ec3fa546f3ac2551ee39736ac59b78
parent2f2236373606eaac2311fe8ed8cba458ae24055c (diff)
parent4b27aba1df5315b12e72425d3fd9a6803612646b (diff)
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into 1.0
-rw-r--r--src/multimedia/effects/effects.pri5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/multimedia/effects/effects.pri b/src/multimedia/effects/effects.pri
index 50764f7d68..14c60faa33 100644
--- a/src/multimedia/effects/effects.pri
+++ b/src/multimedia/effects/effects.pri
@@ -3,11 +3,12 @@ INCLUDEPATH += effects \
unix:!mac:!symbian {
contains(QT_CONFIG, pulseaudio) {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += libpulse
+
DEFINES += QT_MULTIMEDIA_PULSEAUDIO
PRIVATE_HEADERS += effects/qsoundeffect_pulse_p.h
SOURCES += effects/qsoundeffect_pulse_p.cpp
- QMAKE_CXXFLAGS += $$QT_CFLAGS_PULSEAUDIO
- LIBS += $$QT_LIBS_PULSEAUDIO
} else {
DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h