equal
deleted
inserted
replaced
460 QImage imageForGlyph(glyph_t glyph, int margin, bool colorful); |
460 QImage imageForGlyph(glyph_t glyph, int margin, bool colorful); |
461 CTFontRef ctfont; |
461 CTFontRef ctfont; |
462 CGFontRef cgFont; |
462 CGFontRef cgFont; |
463 QCoreTextFontEngineMulti *parentEngine; |
463 QCoreTextFontEngineMulti *parentEngine; |
464 int synthesisFlags; |
464 int synthesisFlags; |
|
465 CGAffineTransform transform; |
465 friend class QCoreTextFontEngineMulti; |
466 friend class QCoreTextFontEngineMulti; |
466 }; |
467 }; |
467 |
468 |
468 class QCoreTextFontEngineMulti : public QFontEngineMulti |
469 class QCoreTextFontEngineMulti : public QFontEngineMulti |
469 { |
470 { |
491 { return static_cast<const QCoreTextFontEngine *>(engines.at(i)); } |
492 { return static_cast<const QCoreTextFontEngine *>(engines.at(i)); } |
492 |
493 |
493 uint fontIndexForFont(CTFontRef id) const; |
494 uint fontIndexForFont(CTFontRef id) const; |
494 CTFontRef ctfont; |
495 CTFontRef ctfont; |
495 mutable QCFType<CFMutableDictionaryRef> attributeDict; |
496 mutable QCFType<CFMutableDictionaryRef> attributeDict; |
496 |
497 CGAffineTransform transform; |
497 friend class QFontDialogPrivate; |
498 friend class QFontDialogPrivate; |
498 }; |
499 }; |
499 # endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 |
500 # endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 |
500 |
501 |
501 #ifndef QT_MAC_USE_COCOA |
502 #ifndef QT_MAC_USE_COCOA |