diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-16 11:52:15 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-16 11:52:15 (GMT) |
| commit | 15e2b2d753250bbe01a78d9ece37f0f0b08cd21c (patch) | |
| tree | a37bb70124fdbecbbaf7e0e2a141a359eaf4f412 /src/gui/text/qfont.cpp | |
| parent | 3328e0ee94b94c83fe9d64f741bede6725f5c952 (diff) | |
| parent | 7fdfa58b958b658feb7b20dd7a7322d235fe4bea (diff) | |
| download | Qt-15e2b2d753250bbe01a78d9ece37f0f0b08cd21c.zip Qt-15e2b2d753250bbe01a78d9ece37f0f0b08cd21c.tar.gz Qt-15e2b2d753250bbe01a78d9ece37f0f0b08cd21c.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Diffstat (limited to 'src/gui/text/qfont.cpp')
| -rw-r--r-- | src/gui/text/qfont.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 447087c..4511709 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -309,7 +309,7 @@ QFontPrivate *QFontPrivate::smallCapsFontPrivate() const QFont font(const_cast<QFontPrivate *>(this)); qreal pointSize = font.pointSizeF(); if (pointSize > 0) - font.setPointSizeF(pointSize * .7); + font.setPointSizeF(pointSize * qreal(.7)); else font.setPixelSize((font.pixelSize() * 7 + 5) / 10); scFont = font.d.data(); @@ -2143,7 +2143,7 @@ QDataStream &operator<<(QDataStream &s, const QFont &font) if (s.version() >= QDataStream::Qt_4_0) { // 4.0 - double pointSize = font.d->request.pointSize; + qreal pointSize = font.d->request.pointSize; qint32 pixelSize = font.d->request.pixelSize; s << pointSize; s << pixelSize; @@ -2205,7 +2205,7 @@ QDataStream &operator>>(QDataStream &s, QFont &font) if (s.version() >= QDataStream::Qt_4_0) { // 4.0 - double pointSize; + qreal pointSize; qint32 pixelSize; s >> pointSize; s >> pixelSize; |