diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-04 09:14:17 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 09:14:17 +0200 |
commit | 673160b9fd7b9a75336ba293dda7e64f3d732a80 (patch) | |
tree | b37e0216a090fbc9ac19dd55ca5e2ba1af1ef7cb /src/gui/text/qrawfont_qpa.cpp | |
parent | 9a652ed802d5ec1114ba97ad86eca8d2f25c53d9 (diff) | |
parent | 92c998afb66a2ec900d50cab57929c0a97ad46ac (diff) |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/gui/text/qrawfont_qpa.cpp')
-rw-r--r-- | src/gui/text/qrawfont_qpa.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qrawfont_qpa.cpp b/src/gui/text/qrawfont_qpa.cpp index b80b64cbaf..47815baf06 100644 --- a/src/gui/text/qrawfont_qpa.cpp +++ b/src/gui/text/qrawfont_qpa.cpp @@ -53,7 +53,7 @@ void QRawFontPrivate::platformCleanUp() { } -void QRawFontPrivate::platformLoadFromData(const QByteArray &fontData, int pixelSize, +void QRawFontPrivate::platformLoadFromData(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) { Q_ASSERT(fontEngine == 0); |