diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-17 10:43:48 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-17 12:48:25 +0200 |
| commit | 83940f25dba51a9942ab55ed8475fc7fc8a8da84 (patch) | |
| tree | f75781414ee2686d9e02edafb8b713bc4aa6e613 /src/gui/text/text.pri | |
| parent | 5bc8c27e9406fd55693e3a3963030c6d9a89b08a (diff) | |
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/gui/text/text.pri')
| -rw-r--r-- | src/gui/text/text.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index fc33d4358f..94ed75631a 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -164,7 +164,7 @@ contains(QT_CONFIG, freetype) { embedded:CONFIG += opentype # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) - LIBS += -lfreetype + LIBS_PRIVATE += -lfreetype } else { DEFINES *= QT_NO_FREETYPE } |