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 4581a9999e
This commit is contained in:
parent
cf1a53cf3c
commit
2e94bef1e4
@ -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();
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user