diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-04 14:06:06 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-05 11:35:23 (GMT) |
| commit | c8f299b7e675c839b16d750cd2633a57cdd0526f (patch) | |
| tree | 47b9061e8883e20c9ed4b2050fd4ba9662b6a265 /src/gui/text | |
| parent | 4ff06543edc10ce77458d6aa66b2faf1a2c96a91 (diff) | |
| download | Qt-c8f299b7e675c839b16d750cd2633a57cdd0526f.zip Qt-c8f299b7e675c839b16d750cd2633a57cdd0526f.tar.gz Qt-c8f299b7e675c839b16d750cd2633a57cdd0526f.tar.bz2 | |
Add a way to retrieve CTFontRef from QFont
Since macFontID restricts to quint32, we have to return that in
QFont::handle.
Task-number: QTBUG-17890
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont_mac.cpp | 7 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_coretext_p.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/text/qfont_mac.cpp b/src/gui/text/qfont_mac.cpp index daf68c0..044fd84 100644 --- a/src/gui/text/qfont_mac.cpp +++ b/src/gui/text/qfont_mac.cpp @@ -43,6 +43,7 @@ #include "qfont_p.h" #include "qfontengine_p.h" #include "qfontengine_mac_p.h" +#include "qfontengine_coretext_p.h" #include "qfontinfo.h" #include "qfontmetrics.h" #include "qpaintdevice.h" @@ -119,10 +120,10 @@ quint32 QFont::macFontID() const // ### need 64-bit version // Returns an ATSUFonFamilyRef Qt::HANDLE QFont::handle() const { -#if 0 +#ifdef QT_MAC_USE_COCOA QFontEngine *fe = d->engineForScript(QUnicodeTables::Common); - if (fe && fe->type() == QFontEngine::Mac) - return (Qt::HANDLE)static_cast<QFontEngineMacMulti*>(fe)->fontFamilyRef(); + if (fe && fe->type() == QFontEngine::Multi) + return (Qt::HANDLE)static_cast<QCoreTextFontEngineMulti*>(fe)->macFontID(); #endif return 0; } diff --git a/src/gui/text/qfontengine_coretext_p.h b/src/gui/text/qfontengine_coretext_p.h index bb80a9b..3775bc6 100644 --- a/src/gui/text/qfontengine_coretext_p.h +++ b/src/gui/text/qfontengine_coretext_p.h @@ -124,6 +124,8 @@ public: QScriptItem *si) const; virtual const char *name() const { return "CoreText"; } + inline CTFontRef macFontID() const { return ctfont; } + protected: virtual void loadEngine(int at); |