summaryrefslogtreecommitdiffstats
path: root/src/network/access/access.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/network/access/access.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/network/access/access.pri')
-rw-r--r--src/network/access/access.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index ab7b3a7..edc1b63 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -59,6 +59,6 @@ SOURCES += access/qftp.cpp \
contains(QT_CONFIG, zlib) {
INCLUDEPATH += ../3rdparty/zlib
} else:!contains(QT_CONFIG, no-zlib) {
- unix:LIBS += -lz
+ unix:LIBS_PRIVATE += -lz
# win32:LIBS += libz.lib
}