diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-23 01:28:13 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-23 01:28:13 (GMT) |
| commit | 18c3446a964791726c4e06f86344d5db0289b554 (patch) | |
| tree | 4d405e0917d26d303e25f7bb4f5039f4914b8f79 /src/svg | |
| parent | d32adfd34f5cd2334b4041dfc0c07a5538ccdff7 (diff) | |
| parent | 62d1160250274dc355d1998357e606131527db2c (diff) | |
| download | Qt-18c3446a964791726c4e06f86344d5db0289b554.zip Qt-18c3446a964791726c4e06f86344d5db0289b554.tar.gz Qt-18c3446a964791726c4e06f86344d5db0289b554.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvgstyle.cpp | 2 | ||||
| -rw-r--r-- | src/svg/qsvgstyle_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index 0d1bad9..f228a77 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -241,7 +241,7 @@ void QSvgFontStyle::apply(QPainter *p, const QSvgNode *, QSvgExtraStates &states } if (m_sizeSet) - font.setPointSize(m_qfont.pointSizeF()); + font.setPointSizeF(m_qfont.pointSizeF()); if (m_styleSet) font.setStyle(m_qfont.style()); diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h index af3b4e5..dfea12c 100644 --- a/src/svg/qsvgstyle_p.h +++ b/src/svg/qsvgstyle_p.h @@ -338,7 +338,7 @@ public: { // Store the _pixel_ size in the font. Since QFont::setPixelSize() only takes an int, call // QFont::SetPointSize() instead. Set proper font size just before rendering. - m_qfont.setPointSize(size); + m_qfont.setPointSizeF(size); m_sizeSet = 1; } |