diff options
| author | aavit <qt-info@nokia.com> | 2011-10-21 07:59:50 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-10-21 07:59:50 (GMT) |
| commit | cda84350a3e38d7a35e6341720e3e353803b8dea (patch) | |
| tree | 240ba38d683ad1256ca7ddd54f51bf6f21962056 /src/gui/text/qfontdatabase.cpp | |
| parent | e5098123c12880d922923d1117f7b82995c6b5a0 (diff) | |
| parent | 4673878256262802c07303fce1e1f8cc1b7e652b (diff) | |
| download | Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.zip Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.tar.gz Qt-cda84350a3e38d7a35e6341720e3e353803b8dea.tar.bz2 | |
Merge remote-tracking branch 'qt-fire-review/master'
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 1d463c4..796c455 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1994,7 +1994,7 @@ QList<int> QFontDatabase::pointSizes(const QString &family, const QtFontSize *size = style->pixelSizes + l; if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) { - const uint pointSize = qRound(size->pixelSize * 72.0 / dpi); + const uint pointSize = qRound(size->pixelSize * qreal(72.0) / dpi); if (! sizes.contains(pointSize)) sizes.append(pointSize); } @@ -2105,7 +2105,7 @@ QList<int> QFontDatabase::smoothSizes(const QString &family, const QtFontSize *size = style->pixelSizes + l; if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) { - const uint pointSize = qRound(size->pixelSize * 72.0 / dpi); + const uint pointSize = qRound(size->pixelSize * qreal(72.0) / dpi); if (! sizes.contains(pointSize)) sizes.append(pointSize); } |