diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-08-08 13:26:30 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-08-08 13:26:30 (GMT) |
| commit | e28e1f919cdc2b82c45b2a5ceee7a9261e70433d (patch) | |
| tree | 31e2cf533867b86545b509dd7ee472182a4527f3 /src/gui/text/qrawfont.h | |
| parent | 74b7d4c2c4036e9f2c0da7f0eaad06cef954b923 (diff) | |
| parent | 82a18deee74bef3e545bf6426164dbe12548e5d9 (diff) | |
| download | Qt-e28e1f919cdc2b82c45b2a5ceee7a9261e70433d.zip Qt-e28e1f919cdc2b82c45b2a5ceee7a9261e70433d.tar.gz Qt-e28e1f919cdc2b82c45b2a5ceee7a9261e70433d.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/text/qrawfont.h')
| -rw-r--r-- | src/gui/text/qrawfont.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h index 99e0837..d5b5680 100644 --- a/src/gui/text/qrawfont.h +++ b/src/gui/text/qrawfont.h @@ -70,10 +70,10 @@ public: QRawFont(); QRawFont(const QString &fileName, - int pixelSize, + qreal pixelSize, QFont::HintingPreference hintingPreference = QFont::PreferDefaultHinting); QRawFont(const QByteArray &fontData, - int pixelSize, + qreal pixelSize, QFont::HintingPreference hintingPreference = QFont::PreferDefaultHinting); QRawFont(const QRawFont &other); ~QRawFont(); @@ -114,15 +114,15 @@ public: qreal unitsPerEm() const; void loadFromFile(const QString &fileName, - int pixelSize, + qreal pixelSize, QFont::HintingPreference hintingPreference); void loadFromData(const QByteArray &fontData, - int pixelSize, + qreal pixelSize, QFont::HintingPreference hintingPreference); bool supportsCharacter(quint32 ucs4) const; - bool supportsCharacter(const QChar &character) const; + bool supportsCharacter(QChar character) const; QList<QFontDatabase::WritingSystem> supportedWritingSystems() const; QByteArray fontTable(const char *tagName) const; |