From be227b0a01bb28f3ebebedc1aaa65cd8098edd81 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 22 Jul 2010 10:27:58 +0200 Subject: Fix the smallFont test failure for Mac and Linux Reviewed-by: Kim --- src/svg/qsvgstyle.cpp | 2 +- tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp index 519f4f5..69ae996 100644 --- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp +++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp @@ -1356,7 +1356,9 @@ void tst_QSvgRenderer::smallFont() QByteArray data(svgs[i]); if (i == 0) { QTest::ignoreMessage(QtWarningMsg, "QFont::setPointSizeF: Point size <= 0 (0.000000), must be greater than 0"); +#ifdef Q_WS_WIN QTest::ignoreMessage(QtWarningMsg, "QFont::setPointSize: Point size <= 0 (0), must be greater than 0"); +#endif } QSvgRenderer renderer(data); images[i] = QImage(50, 50, QImage::Format_ARGB32_Premultiplied); -- cgit v0.12