diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-14 06:13:10 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-14 16:06:43 (GMT) |
| commit | 88a07b4c0a3a87eeb47750640cb71a5a64e0573c (patch) | |
| tree | 906708a3289b95caf0e7e108967f6ef37389bbfd /src | |
| parent | 1ca42be0498744dd1270241d2ccfe3d578d82a98 (diff) | |
| download | Qt-88a07b4c0a3a87eeb47750640cb71a5a64e0573c.zip Qt-88a07b4c0a3a87eeb47750640cb71a5a64e0573c.tar.gz Qt-88a07b4c0a3a87eeb47750640cb71a5a64e0573c.tar.bz2 | |
Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent for review into 4.6.
Task-number: QTBUG-7326
Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfont.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 4c57dff..bbd35f1 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1614,7 +1614,11 @@ bool QFont::operator==(const QFont &f) const && f.d->overline == d->overline && f.d->strikeOut == d->strikeOut && f.d->kerning == d->kerning - && f.d->capital == d->capital)); + && f.d->capital == d->capital + && f.d->letterSpacingIsAbsolute == d->letterSpacingIsAbsolute + && f.d->letterSpacing == d->letterSpacing + && f.d->wordSpacing == d->wordSpacing + )); } @@ -1648,6 +1652,10 @@ bool QFont::operator<(const QFont &f) const #endif // Q_WS_X11 if (f.d->capital != d->capital) return f.d->capital < d->capital; + if (f.d->letterSpacingIsAbsolute != d->letterSpacingIsAbsolute) return f.d->letterSpacingIsAbsolute < d->letterSpacingIsAbsolute; + if (f.d->letterSpacing != d->letterSpacing) return f.d->letterSpacing < d->letterSpacing; + if (f.d->wordSpacing != d->wordSpacing) return f.d->wordSpacing < d->wordSpacing; + int f1attrs = (f.d->underline << 3) + (f.d->overline << 2) + (f.d->strikeOut<<1) + f.d->kerning; int f2attrs = (d->underline << 3) + (d->overline << 2) + (d->strikeOut<<1) + d->kerning; return f1attrs < f2attrs; |