Move glyphMargin() to QFontEngine
authorJiang Jiang <jiang.jiang@nokia.com>
Mon, 23 Jan 2012 14:06:41 +0000 (15:06 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 24 Jan 2012 16:42:04 +0000 (17:42 +0100)
commitaf48e0ba36aed330e8b262687e3192d7e09796f7
treef6d67b0c2d871ef169f61d7e0afcc578efefe5f2
parent601d68584921a47d83d833228f5ec698e13b624c
Move glyphMargin() to QFontEngine

glyphMargin() support for QTextureGlyphCache is implemented in
respective font engines, thus this function is platform dependent.
Before Qt 5 the code is guarded in macros like #ifdef Q_WS_MAC,
now we should move them into QFontEngine and its subclasses.

So far only Windows font engines support it. FreeType and Core Text
based font engines all ignore it.

Change-Id: Ia14016533d8fbfaacf848a7d3bc928f8197318f5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
17 files changed:
src/gui/opengl/qopenglpaintengine.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qtextureglyphcache.cpp
src/gui/painting/qtextureglyphcache_p.h
src/gui/text/qfontengine.cpp
src/gui/text/qfontengine_ft.cpp
src/gui/text/qfontengine_ft_p.h
src/gui/text/qfontengine_p.h
src/gui/text/qfontenginedirectwrite.cpp
src/gui/text/qfontenginedirectwrite_p.h
src/gui/text/qrawfont.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
src/plugins/platforms/windows/qwindowsfontengine.cpp
src/plugins/platforms/windows/qwindowsfontengine.h
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h