summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/audio.pri
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-08-17 08:43:48 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-08-17 10:48:25 (GMT)
commit83940f25dba51a9942ab55ed8475fc7fc8a8da84 (patch)
treef75781414ee2686d9e02edafb8b713bc4aa6e613 /src/multimedia/audio/audio.pri
parent5bc8c27e9406fd55693e3a3963030c6d9a89b08a (diff)
downloadQt-83940f25dba51a9942ab55ed8475fc7fc8a8da84.zip
Qt-83940f25dba51a9942ab55ed8475fc7fc8a8da84.tar.gz
Qt-83940f25dba51a9942ab55ed8475fc7fc8a8da84.tar.bz2
Use LIBS_PRIVATE on Mac and X11.
On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
Diffstat (limited to 'src/multimedia/audio/audio.pri')
-rw-r--r--src/multimedia/audio/audio.pri4
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
}
}
}