diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-10-28 12:34:55 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-10-28 12:40:04 (GMT) |
| commit | 8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572 (patch) | |
| tree | 8c9717f0a6437d544a5ca0153aa65f86fa487d2b /src/plugins/platforms/cocoa | |
| parent | fee7ca62b6611f4a662fbb4541c83e280be08aba (diff) | |
| download | Qt-8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572.zip Qt-8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572.tar.gz Qt-8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572.tar.bz2 | |
Fix the license in files for Lighthouse
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 7701b9c..1633ee4 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -23,7 +23,7 @@ OBJECTIVE_HEADERS = qcocoaintegration.h \ LIBS += -lz LIBS += -framework cocoa -include(../fontdatabases/genericunix/genericunix.pri) +include(../fontdatabases/coretext/coretext.pri) target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index baf5a73..79d5f51 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -45,7 +45,7 @@ #include "qcocoawindowsurface.h" #include "qcocoaeventloopintegration.h" -#include "qgenericunixfontdatabase.h" +#include "qcoretextfontdatabase.h" #include <QtGui/QApplication> @@ -74,7 +74,7 @@ QCocoaScreen::~QCocoaScreen() } QCocoaIntegration::QCocoaIntegration() - : mFontDb(new QGenericUnixFontDatabase()) + : mFontDb(new QCoreTextFontDatabase()) { mPool = new QCocoaAutoReleasePool; |