diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
| commit | 8821284ac4e55caf5fe712fca002e79220e9cf7e (patch) | |
| tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /src/gui/text/qfontengine_p.h | |
| parent | 2c5b7fe040575aa2ee560117c1c3455724c2f9ae (diff) | |
| parent | 13f703741dee67adc7d92e4bcf525431334c9a60 (diff) | |
| download | Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.zip Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.gz Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index e289aa9..dc18991 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -178,7 +178,7 @@ public: * Create a qimage with the alpha values for the glyph. * Returns an image indexed_8 with index values ranging from 0=fully transparant to 255=opaque */ - virtual QImage alphaMapForGlyph(glyph_t) = 0; + virtual QImage alphaMapForGlyph(glyph_t); virtual QImage alphaMapForGlyph(glyph_t, const QTransform &t); virtual QImage alphaRGBMapForGlyph(glyph_t, int margin, const QTransform &t); @@ -480,7 +480,7 @@ private: uint fontIndexForFont(CTFontRef id) const; CTFontRef ctfont; - mutable QCFType<CFDictionaryRef> attributeDict; + mutable QCFType<CFMutableDictionaryRef> attributeDict; friend class QFontDialogPrivate; }; |