Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

1 files changed, 5 insertions, 2 deletions

diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h
index e04f4ac..c6112ba 100644
--- a/src/gui/text/qfontengineglyphcache_p.h
+++ b/src/gui/text/qfontengineglyphcache_p.h
@@ -75,17 +75,20 @@ QT_BEGIN_NAMESPACE
 class QFontEngineGlyphCache
 {
 public:
-    QFontEngineGlyphCache(const QTransform &matrix) : m_transform(matrix) { }
-
     enum Type {
         Raster_RGBMask,
         Raster_A8,
         Raster_Mono
     };
 
+    QFontEngineGlyphCache(const QTransform &matrix, Type type) : m_transform(matrix), m_type(type) { }
+
     virtual ~QFontEngineGlyphCache() { }
 
+    Type cacheType() const { return m_type; }
+
     QTransform m_transform;
+    QFontEngineGlyphCache::Type m_type;
 };
 typedef QHash<void *, QList<QFontEngineGlyphCache *> > GlyphPointerHash;
 typedef QHash<int, QList<QFontEngineGlyphCache *> > GlyphIntHash;