diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-10 00:38:04 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-10 00:38:04 (GMT) |
| commit | 9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72 (patch) | |
| tree | 8b2a12fbf2cd035b7980cc91b1bce0c8a12f2127 /src/gui/text/qtextengine_p.h | |
| parent | 2b7de14b26de6f38b73b691c881f1c8f7be1a354 (diff) | |
| parent | a6b3fdccab1a4d3ed941ba069dc632aa9c8dc755 (diff) | |
| download | Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.zip Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.tar.gz Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/text/qtextengine_p.h')
| -rw-r--r-- | src/gui/text/qtextengine_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index f36cbd2..5054b66 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -382,6 +382,7 @@ struct Q_AUTOTEST_EXPORT QScriptLine QFixed y; QFixed width; QFixed textWidth; + QFixed textAdvance; int from; signed int length : 29; mutable uint justified : 1; |