From: Pierre Rossi <pierre.rossi@nokia.com>
Date: Tue, 24 Jan 2012 19:22:14 +0000 (+0100)
Subject: Don't lose the fontDef when setting the size of a raw font.
X-Git-Tag: qt-v5.0.0-alpha1~1573
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e52ef6788b38f22ed024f1595392fd620e0773ef;p=profile%2Fivi%2Fqtbase.git

Don't lose the fontDef when setting the size of a raw font.

QFontEngineFT::cloneWithSize, which is used among other things by
QRawFont::setPixelSize, should create a new font engine using the font
definition from the current font engine.

Change-Id: I9415422bbecc2bf7b7acf105c12c1c83a894526c
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
---

diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 31882af..4df368d 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -2058,7 +2058,7 @@ bool QFontEngineFT::initFromFontEngine(const QFontEngineFT *fe)
 
 QFontEngine *QFontEngineFT::cloneWithSize(qreal pixelSize) const
 {
-    QFontDef fontDef;
+    QFontDef fontDef(this->fontDef);
     fontDef.pixelSize = pixelSize;
     QFontEngineFT *fe = new QFontEngineFT(fontDef);
     if (!fe->initFromFontEngine(this)) {