diff options
| author | Mathias Hasselmann <mathias.hasselmann@kdab.com> | 2014-11-07 22:22:10 +0100 |
|---|---|---|
| committer | Andreas Hartmetz <ahartmetz@gmail.com> | 2015-08-11 09:40:30 +0000 |
| commit | bf013c9e745c63cb112be4d3a37027ff997927dd (patch) | |
| tree | e692a93ec24e8a2e4b3be81e971dcad3a234dca9 /src/plugins/platforms/cocoa/qcocoaintegration.h | |
| parent | 55512950281260b85ea40c08239e459c76b696d2 (diff) | |
OSX: Add initial FreeType support
This permits text rendering consistent with other FreeType enabled platforms,
like Windows and Linux.
Task-number: QTBUG-42839
Change-Id: I8c99bcaa3fb07c16e935a0c3705af467bc3da584
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 3b8730151e..9e5dd3747e 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -97,10 +97,16 @@ public: class QCocoaIntegration : public QPlatformIntegration { public: - QCocoaIntegration(); + enum Option { + UseFreeTypeFontEngine = 0x1 + }; + Q_DECLARE_FLAGS(Options, Option) + + QCocoaIntegration(const QStringList ¶mList); ~QCocoaIntegration(); static QCocoaIntegration *instance(); + Options options() const; bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; @@ -141,6 +147,7 @@ public: void setApplicationIcon(const QIcon &icon) const Q_DECL_OVERRIDE; private: static QCocoaIntegration *mInstance; + Options mOptions; QScopedPointer<QCoreTextFontDatabase> mFontDb; @@ -160,6 +167,8 @@ private: QList<QCocoaWindow *> m_popupWindowStack; }; +Q_DECLARE_OPERATORS_FOR_FLAGS(QCocoaIntegration::Options) + QT_END_NAMESPACE #endif |