diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-30 16:11:03 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-30 16:11:03 +0200 |
| commit | 1ba3cac3c7296320ca914f262f124ae7f2dea841 (patch) | |
| tree | 40e9c04835dcfe8adccb4cedfda5e568f3c92677 /src/gui/text/qfontengine_p.h | |
| parent | 708978d1c18cf938a4e0c29a5a90be5de4e82140 (diff) | |
| parent | 51582e3d1251766a3ed941530d966e1a591cbed6 (diff) | |
| download | qt4-tools-1ba3cac3c7296320ca914f262f124ae7f2dea841.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 4e518d632f..6e9bd0bc2e 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -258,6 +258,7 @@ public: protected: QFont createExplicitFontWithName(const QString &familyName) const; static const QVector<QRgb> &grayPalette(); + QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false); private: struct GlyphCacheEntry { |