diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-21 09:47:30 +0200 |
|---|---|---|
| committer | Morten Sorvig <morten.sorvig@nokia.com> | 2011-06-21 09:52:29 +0200 |
| commit | 2e94bef1e4be9ac25f2bb47da3f359d044a152a7 (patch) | |
| tree | 8fe376c071bad193bebc04a7c1ef0a06cb901139 /src/plugins/platforms/cocoa | |
| parent | cf1a53cf3c5b5849efc7e024c07b08afb8686f28 (diff) | |
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
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index b0e7e73dc7..489e633674 100644 --- 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 89aa0033b8..c29fda0288 100644 --- 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 |