Fixed text rendering via scaled QPainter on rasterPaintEngine / Symbian

Text rendering in Qt for Symbian looks very bad on a scaled QPainter.

Instead of simply using a Symbian font with the right size it followed
the code path that is usually used for "tricky transformation":
Use the glyph outlines and rasterize them in Qt as QPainterPath.
That's slow and especially ugly on Symbian since we do not (yet)
get the glyph outlines from Symbian.

This patch adds QFontEngineS60::setFontScale() so that QFontEngineS60
has one additional native font handle with the scaled size. The raster
paint engine will call that function in case that the painter is scaled.
Since we already have QFontEngineS60 specific code in the raster paint
engine, this patch did not have to add #ifdefs.

http://bugreports.qt.nokia.com/browse/QTBUG-7614

Task-number: QTBUG-7614
Reviewed-by: Jason Barron

	modified:   gui/painting/qpaintengine_raster.cpp
	modified:   gui/text/qfontengine_s60.cpp
	modified:   gui/text/qfontengine_s60_p.h

1 files changed, 8 insertions, 2 deletions

diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h
index 4748497d90..78f8a9a2fc 100644
--- a/src/gui/text/qfontengine_s60_p.h
+++ b/src/gui/text/qfontengine_s60_p.h
@@ -117,15 +117,21 @@ public:
     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