diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
| commit | 7075e291998612a3c0a530bb37a515dd07739e28 (patch) | |
| tree | 4e1992498d82ee3f6f92fd6d42754c92928dd581 /src/gui/text | |
| parent | 1161a8a62907796ea45b1877bec31e66aeef77f6 (diff) | |
| parent | 3d9a40038f01bc2a3df0027a9be04e7fa3ce3850 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qstyleanimation.cpp
Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengineglyphcache_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h index 18440f22fa..092873a4d4 100644 --- a/src/gui/text/qfontengineglyphcache_p.h +++ b/src/gui/text/qfontengineglyphcache_p.h @@ -69,7 +69,8 @@ public: enum Type { Raster_RGBMask, Raster_A8, - Raster_Mono + Raster_Mono, + Raster_ARGB }; QFontEngineGlyphCache(const QTransform &matrix, Type type) : m_transform(matrix), m_type(type) { } |