From 2e94bef1e4be9ac25f2bb47da3f359d044a152a7 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Tue, 21 Jun 2011 09:47:30 +0200 Subject: Compile fix for platformsupport on Mac. Switch platformsupport over to be a shared library, which is well supported by the build system. This requires exporting classes we use. I've done this on OS_MAC only for now. Reverts 4581a9999e12e14bbf0836d0740191ba50109540 --- .../fontdatabases/basicunix/qbasicunixfontdatabase_p.h | 4 ++++ src/platformsupport/platformsupport.pro | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h b/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h index f7fc0e547b..85b5cee733 100644 --- a/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h @@ -52,7 +52,11 @@ 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 8bd931d53a..e808cbd404 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -5,7 +5,10 @@ QT += core-private gui-private TEMPLATE = lib DESTDIR = $$QMAKE_LIBDIR_QT -CONFIG += module staticlib +CONFIG += module +!mac:CONFIG += staticlib +mac:LIBS+=-lz + MODULE_PRI = ../modules/qt_platformssupport.pri unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -- cgit v1.2.3