diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 10:13:28 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 10:13:28 (GMT) |
commit | 8f9d38ed63a2c568596febe5ea59a55fe03d7ba9 (patch) | |
tree | aed0951fc53191a24c3f64862554976c57a708c9 /src/gui/text/qfontengine_p.h | |
parent | 0bf1b83cd7d972a69388cdbd759dbba8b1baffd2 (diff) | |
parent | 72cc21e597f2d77ea1be3c1a3f7df36d8909d2fc (diff) | |
download | Qt-8f9d38ed63a2c568596febe5ea59a55fe03d7ba9.zip Qt-8f9d38ed63a2c568596febe5ea59a55fe03d7ba9.tar.gz Qt-8f9d38ed63a2c568596febe5ea59a55fe03d7ba9.tar.bz2 |
Merge branch 'qt-4.7' into lighthouse-4.7
Conflicts:
configure
src/corelib/tools/qsimd.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 897f76f..48f3ce0 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -253,6 +253,7 @@ public: protected: static const QVector<QRgb> &grayPalette(); + QFixed lastRightBearing(const QGlyphLayout &glyphs, bool round = false); private: struct GlyphCacheEntry { |