From e53480370409b96d24d3f53513e8b2019a398e70 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Thu, 4 Mar 2010 11:12:44 +0100
Subject: 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
---
 src/multimedia/effects/effects.pri | 21 +++++++++++----------
 1 file 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
-- 
cgit v0.12