summaryrefslogtreecommitdiffstats
path: root/src/qt3support
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/qt3support
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/qt3support')
-rw-r--r--src/qt3support/network/network.pri2
-rw-r--r--src/qt3support/qt3support.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qt3support/network/network.pri b/src/qt3support/network/network.pri
index 31ea682..086f56a 100644
--- a/src/qt3support/network/network.pri
+++ b/src/qt3support/network/network.pri
@@ -26,5 +26,5 @@ SOURCES += network/q3dns.cpp \
win32:SOURCES += network/q3socketdevice_win.cpp
unix:SOURCES += network/q3socketdevice_unix.cpp
-mac:LIBS += -lresolv
+mac:LIBS_PRIVATE += -lresolv
diff --git a/src/qt3support/qt3support.pro b/src/qt3support/qt3support.pro
index 23a4696..a30117c 100644
--- a/src/qt3support/qt3support.pro
+++ b/src/qt3support/qt3support.pro
@@ -25,7 +25,7 @@ unix {
QMAKE_PKGCONFIG_CFLAGS += -DQT3_SUPPORT
QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork QtSql
}
-mac:LIBS += -framework Carbon
+mac:LIBS_PRIVATE += -framework Carbon
QMAKE_LIBS += $$QMAKE_LIBS_COMPAT $$QMAKE_LIBS_NETWORK
DEFINES -= QT3_SUPPORT_WARNINGS