diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-11 17:19:29 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-11 17:19:29 (GMT) |
| commit | 8c13e18eb49ab9ab42db4359f0ccc91de5c72818 (patch) | |
| tree | 17dbc029e37835594ad29d586f3fc7ec8013b65a /src/gui/text | |
| parent | de76200652e05de34d99f111c64a051a49911034 (diff) | |
| parent | 2d63f8fe5b77747014e1c5807c9d457611bd9304 (diff) | |
| download | Qt-8c13e18eb49ab9ab42db4359f0ccc91de5c72818.zip Qt-8c13e18eb49ab9ab42db4359f0ccc91de5c72818.tar.gz Qt-8c13e18eb49ab9ab42db4359f0ccc91de5c72818.tar.bz2 | |
Merge commit 'widget/4.6' into oslo-staging-2/4.6
Conflicts:
src/gui/painting/qbrush.cpp
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 447087c..f1cd6bb 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1613,7 +1613,8 @@ bool QFont::operator==(const QFont &f) const && f.d->underline == d->underline && f.d->overline == d->overline && f.d->strikeOut == d->strikeOut - && f.d->kerning == d->kerning)); + && f.d->kerning == d->kerning + && f.d->capital == d->capital)); } @@ -1645,6 +1646,7 @@ bool QFont::operator<(const QFont &f) const #ifdef Q_WS_X11 if (r1.addStyle != r2.addStyle) return r1.addStyle < r2.addStyle; #endif // Q_WS_X11 + if (f.d->capital != d->capital) return f.d->capital < d->capital; 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; |