diff options
| author | Honglei Zhang <honglei.zhang@nokia.com> | 2011-08-04 07:47:56 (GMT) |
|---|---|---|
| committer | Honglei Zhang <honglei.zhang@nokia.com> | 2011-08-04 07:47:56 (GMT) |
| commit | 41c038dadb505d82447e1d9a8a743e0614c60098 (patch) | |
| tree | c05e11632c8898db7d2e443f6cb09fda75592c14 /src/gui/text/qrawfont_p.h | |
| parent | 8e2dc4ac2ec35e9b2f57ade5af390c2d44765382 (diff) | |
| parent | 920ce5ed71bc456e429b887801a8d8bea7a3db0d (diff) | |
| download | Qt-41c038dadb505d82447e1d9a8a743e0614c60098.zip Qt-41c038dadb505d82447e1d9a8a743e0614c60098.tar.gz Qt-41c038dadb505d82447e1d9a8a743e0614c60098.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/gui/text/qrawfont_p.h')
| -rw-r--r-- | src/gui/text/qrawfont_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qrawfont_p.h b/src/gui/text/qrawfont_p.h index a7a03b7..fdf7cad 100644 --- a/src/gui/text/qrawfont_p.h +++ b/src/gui/text/qrawfont_p.h @@ -99,7 +99,7 @@ public: void cleanUp(); void platformCleanUp(); void platformLoadFromData(const QByteArray &fontData, - int pixelSize, + qreal pixelSize, QFont::HintingPreference hintingPreference); static QRawFontPrivate *get(const QRawFont &font) { return font.d.data(); } |