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

1 files changed, 12 insertions, 2 deletions

diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 868484e..4231721 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -73,16 +73,26 @@ x11 {
     }
 
     contains(QT_CONFIG, fontconfig) {
+        contains(QT_CONFIG, system-freetype) {
+            embedded:CONFIG += opentype
+            # pull in the proper freetype2 include directory
             include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
+            LIBS_PRIVATE += -lfreetype
+        } else {
+            ### Note: how does this compile with a non-system freetype?
+	    # This probably doesn't compile
+        }
     } else {
         DEFINES *= QT_NO_FREETYPE
     }
+
+    LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
 }
 
 mac {
     OBJECTIVE_SOURCES += qgl_mac.mm \
                          qglpixelbuffer_mac.mm
-    LIBS += -framework AppKit
+    LIBS_PRIVATE += -framework AppKit -framework Carbon
 }
 win32:!wince*: {
     SOURCES += qgl_win.cpp \
@@ -131,5 +141,5 @@ wince*: {
     }
 
 } else {
-    QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
+    LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL
 }