diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-05-09 15:12:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-13 12:18:26 +0200 |
| commit | 6e5410e5b5e41e9360f70a66171ab819d9286cab (patch) | |
| tree | 67636a551cc0ddda7d57234bea799e8b67712669 /src/gui/text/qrawfont_p.h | |
| parent | 6e90a48920b2f60449fe4305bc79b5be429ca5fe (diff) | |
qpa: merge qrawfont_qpa.cpp
Change-Id: I8552199c8b3e365adefbc2bb096c8153e222cec8
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/gui/text/qrawfont_p.h')
| -rw-r--r-- | src/gui/text/qrawfont_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qrawfont_p.h b/src/gui/text/qrawfont_p.h index c9c15717cc..b13454c391 100644 --- a/src/gui/text/qrawfont_p.h +++ b/src/gui/text/qrawfont_p.h @@ -95,8 +95,7 @@ public: } void cleanUp(); - void platformCleanUp(); - void platformLoadFromData(const QByteArray &fontData, + void loadFromData(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference); |