From ceed409b40fd5b8fe5c62ac33144e66f50b28ede Mon Sep 17 00:00:00 2001
From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Wed, 24 Aug 2011 09:47:20 +0200
Subject: Mac: make platformsupport a static lib
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "force framework/no-framework" logic does not
really work, since Qt is now a mix of frameworks
and statics libs. Remove this code path and use
the "detection" path instead.

Also remove the exports from platformsupport.

Change-Id: I0a308666480445eb47c4f443ff7529addecad10d
Reviewed-on: http://codereview.qt.nokia.com/3464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---
 src/platformsupport/cglconvenience/cglconvenience_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/platformsupport/cglconvenience')

diff --git a/src/platformsupport/cglconvenience/cglconvenience_p.h b/src/platformsupport/cglconvenience/cglconvenience_p.h
index f7426b4cc1..96433b69d0 100644
--- a/src/platformsupport/cglconvenience/cglconvenience_p.h
+++ b/src/platformsupport/cglconvenience/cglconvenience_p.h
@@ -46,9 +46,9 @@
 #include <QString>
 #include <OpenGL/OpenGL.h>
 
-Q_GUI_EXPORT void (*qcgl_getProcAddress(const QByteArray &procName))();
-Q_GUI_EXPORT QSurfaceFormat qcgl_surfaceFormat();
-Q_GUI_EXPORT void *qcgl_createNSOpenGLPixelFormat();
-Q_GUI_EXPORT CGLContextObj qcgl_createGlContext();
+void (*qcgl_getProcAddress(const QByteArray &procName))();
+QSurfaceFormat qcgl_surfaceFormat();
+void *qcgl_createNSOpenGLPixelFormat();
+CGLContextObj qcgl_createGlContext();
 
 #endif // QMACGLCONVENIENCE_H
-- 
cgit v1.2.3