summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-05-06 13:45:37 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-05-06 13:52:14 (GMT)
commit821b8b540af491ce60d35bd84d3c91399ecc0d16 (patch)
treec54ca4167c3cd3b0ee4940b09e82299633f74c86 /src
parenta423ff5474b89028eeca95b254f5184311c8223b (diff)
downloadQt-821b8b540af491ce60d35bd84d3c91399ecc0d16.zip
Qt-821b8b540af491ce60d35bd84d3c91399ecc0d16.tar.gz
Qt-821b8b540af491ce60d35bd84d3c91399ecc0d16.tar.bz2
Fix QRawFont::setPixelSize() on Mac
When refactoring the setPixelSize() code of QRawFont, it was broken on Mac. To avoid making the same mistake again, I've added a simple autotest to check that the pixel size is actually set. Reviewed-by: Jiang Jiang
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qfontengine_coretext.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm
index d4df218..cbf51e6 100644
--- a/src/gui/text/qfontengine_coretext.mm
+++ b/src/gui/text/qfontengine_coretext.mm
@@ -871,7 +871,7 @@ QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
newFontDef.pixelSize = pixelSize;
newFontDef.pointSize = pixelSize * 72.0 / qt_defaultDpi();
- return new QCoreTextFontEngine(cgFont, fontDef);
+ return new QCoreTextFontEngine(cgFont, newFontDef);
}
QT_END_NAMESPACE