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

diff --git a/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h b/src/platformsupport/fontdatabases/basicunix/qbasicunixfontdatabase_p.h
index f7fc0e5..85b5cee 100644 (file)
--- 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 8bd931d..e808cbd 100644 (file)
--- 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

diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index b0e7e73..489e633 100644 (file)
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -29,7 +29,6 @@ LIBS += -lz
 LIBS += -framework cocoa
 
 QT += core-private gui-private platformsupport-private
-LIBS += -lQtPlatformSupport
 
 CONFIG += qpa/basicunixfontdatabase
 target.path += $$[QT_INSTALL_PLUGINS]/platforms

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 89aa003..c29fda0 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -45,7 +45,7 @@
 #include "qcocoabackingstore.h"
 #include "qcocoanativeinterface.h"
 
-#include <QtPlatformSupport/5.0.0/QtPlatformSupport/private/qbasicunixfontdatabase_p.h>
+#include <QtPlatformSupport/private/qbasicunixfontdatabase_p.h>
 #include <private/qpixmap_raster_p.h>
 
 QT_BEGIN_NAMESPACE