diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-17 13:34:57 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-17 13:34:57 (GMT) |
| commit | d0b0f7b5b44fbec26a67b4afb3a08143b5de4b57 (patch) | |
| tree | c9e8dff623d094d4684be6b95249f04bb02fc697 /src/multimedia | |
| parent | 3a095929a13b9503946d97eded36e02ed07d81d3 (diff) | |
| parent | 4929da8ad0a43220c3cbd2d9f11db4c535028243 (diff) | |
| download | Qt-d0b0f7b5b44fbec26a67b4afb3a08143b5de4b57.zip Qt-d0b0f7b5b44fbec26a67b4afb3a08143b5de4b57.tar.gz Qt-d0b0f7b5b44fbec26a67b4afb3a08143b5de4b57.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/audio/audio.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/audio/audio.pri b/src/multimedia/audio/audio.pri index 3ddb23b..c7fbbb0 100644 --- a/src/multimedia/audio/audio.pri +++ b/src/multimedia/audio/audio.pri @@ -31,7 +31,7 @@ mac { $$PWD/qaudioinput_mac_p.cpp \ $$PWD/qaudio_mac.cpp - LIBS += -framework CoreAudio -framework AudioUnit -framework AudioToolbox + LIBS += -framework ApplicationServices -framework CoreAudio -framework AudioUnit -framework AudioToolbox } else:win32 { @@ -50,7 +50,7 @@ mac { SOURCES += $$PWD/qaudiodeviceinfo_alsa_p.cpp \ $$PWD/qaudiooutput_alsa_p.cpp \ $$PWD/qaudioinput_alsa_p.cpp - LIBS += -lasound + LIBS_PRIVATE += -lasound } } } |