diff -r 3b1da2848fc7 -r d3bac044e0f0 src/gui/text/qfontengine_s60_p.h
--- a/src/gui/text/qfontengine_s60_p.h	Fri Feb 19 23:40:16 2010 +0200
+++ b/src/gui/text/qfontengine_s60_p.h	Fri Mar 12 15:46:37 2010 +0200
@@ -58,9 +58,6 @@
 #include "qsize.h"
 #include <openfont.h>
 
-class CFbsBitmap;
-class CFbsBitmapDevice;
-class CFbsBitGc;
 class CFont;
 
 QT_BEGIN_NAMESPACE
@@ -120,15 +117,21 @@
     Type type() const;
 
     void getCharacterData(glyph_t glyph, TOpenFontCharMetrics& metrics, const TUint8*& bitmap, TSize& bitmapSize) const;
+    void setFontScale(qreal scale);
 
 private:
     friend class QFontPrivate;
 
     QFixed glyphAdvance(HB_Glyph glyph) const;
+    CFont *fontWithSize(qreal size) const;
+    static void releaseFont(CFont *&font);
 
-    CFont* m_font;
     const QFontEngineS60Extensions *m_extensions;
-    qreal m_fontSizeInPixels;
+    CFont* m_originalFont;
+    const qreal m_originalFontSizeInPixels;
+    CFont* m_scaledFont;
+    qreal m_scaledFontSizeInPixels;
+    CFont* m_activeFont;
 };
 
 class QFontEngineMultiS60 : public QFontEngineMulti