diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-08-24 09:47:20 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2011-09-01 13:04:11 +0200 |
| commit | ceed409b40fd5b8fe5c62ac33144e66f50b28ede (patch) | |
| tree | 09cfd19b57252f7bfe086a74e123a826ad42bd24 /src/platformsupport | |
| parent | 82e715b2770258fa2c536aeae1f46c7fccdcdecf (diff) | |
Mac: make platformsupport a static lib
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>
Diffstat (limited to 'src/platformsupport')
4 files changed, 5 insertions, 13 deletions
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 diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h index 690d81ab66..0d9f5b7db0 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h @@ -40,8 +40,4 @@ ****************************************************************************/ class QAbstractEventDispatcher; -#ifdef Q_OS_MAC -Q_GUI_EXPORT QAbstractEventDispatcher* createUnixEventDispatcher(); -#else QAbstractEventDispatcher* createUnixEventDispatcher(); -#endif diff --git a/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h b/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h index 13c931fac7..fa5fce0e20 100644 --- a/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h @@ -52,11 +52,7 @@ struct FontFile int indexValue; }; -#ifdef Q_OS_MAC -class Q_GUI_EXPORT QBasicUnixFontDatabase : public QPlatformFontDatabase -#else class QBasicUnixFontDatabase : public QPlatformFontDatabase -#endif { public: void populateFontDatabase(); diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index f5e62ef925..126cff823a 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -6,7 +6,7 @@ TEMPLATE = lib DESTDIR = $$QMAKE_LIBDIR_QT CONFIG += module -!mac:CONFIG += staticlib +CONFIG += staticlib mac:LIBS += -lz -framework CoreFoundation -framework Carbon MODULE_PRI = ../modules/qt_platformsupport.pri |