diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 10:37:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 10:37:11 (GMT) |
| commit | 8bc0456491e5a7e1fc677fce6e76932ab0d923e8 (patch) | |
| tree | 2e0634859448e83372cb9e381ac38e4bfbbe3a41 /src/multimedia | |
| parent | b3ccc9b30c3a176021b6205193b8baa416e9e813 (diff) | |
| parent | 24c56ac5309150cf7ba42cd974df4e98d97ebb81 (diff) | |
| download | Qt-8bc0456491e5a7e1fc677fce6e76932ab0d923e8.zip Qt-8bc0456491e5a7e1fc677fce6e76932ab0d923e8.tar.gz Qt-8bc0456491e5a7e1fc677fce6e76932ab0d923e8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Build fix for Sun Studio
Finish to resolve merge conflict.
Fixes QMenu to only have static POD members
QScript: Test against QMetaType::QVariant instead of against the string
Fixes tst_QScriptExtQObject::connectAndDisconnect
Fix source compatibility of qRegisterMetaType
Fix warnings on MSVC
Updating documentation for how to build QWS with tslib
sizeHint of checkbox/radiobutton without text is not correct
Some cleanup of outdated src/3rdparty stuff
Revert "Fixes crash when destroying a QGraphicsItem."
Add config.test for multimedia/qml
Fix QVariant autotest
Fix compilation of Q_DECLARE_METATYPE(QVariant) by introducing QMetaType::QVariant
fixed a memory leak when restoring a state in QMainWindow
Make the sub-menu accessible via its shortcut even if it is the current
remove a warning on windows and simplify a bit the code
Add and use QGLContextPrivate::eglSurfaceForDevice()
QMetaType: Now we can register typedefs.
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 |