1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add styleName to QFontDef comparison

Browse Source 
To make sure we cache different font engines with different style
names.

Task-number: QTBUG-19366
Change-Id: Iefaebd5418f212ff759e03c1745f839a7f23d013
Reviewed-on: http://codereview.qt.nokia.com/738
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
This commit is contained in:
Jiang Jiang 2011-06-23 14:19:48 +02:00 committed by Qt by Nokia
parent 3ff0f5f06d
commit a06c8405d0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/text/qfont.cpp
View File

@ -147,6 +147,7 @@ bool QFontDef::exactMatch(const QFontDef &other) const
&& weight == other.weight && weight == other.weight
&& style == other.style && style == other.style
&& this_family == other_family && this_family == other_family
&& styleName == other.styleName
&& (this_foundry.isEmpty() && (this_foundry.isEmpty()
|| other_foundry.isEmpty() || other_foundry.isEmpty()
|| this_foundry == other_foundry) || this_foundry == other_foundry)

3
src/gui/text/qfont_p.h
View File

@ -113,6 +113,7 @@ struct QFontDef
&& styleStrategy == other.styleStrategy && styleStrategy == other.styleStrategy
&& ignorePitch == other.ignorePitch && fixedPitch == other.fixedPitch && ignorePitch == other.ignorePitch && fixedPitch == other.fixedPitch
&& family == other.family && family == other.family
&& styleName == other.styleName
&& hintingPreference == other.hintingPreference && hintingPreference == other.hintingPreference
#ifdef Q_WS_X11 #ifdef Q_WS_X11
&& addStyle == other.addStyle && addStyle == other.addStyle
@ -128,6 +129,8 @@ struct QFontDef
if (styleHint != other.styleHint) return styleHint < other.styleHint; if (styleHint != other.styleHint) return styleHint < other.styleHint;
if (styleStrategy != other.styleStrategy) return styleStrategy < other.styleStrategy; if (styleStrategy != other.styleStrategy) return styleStrategy < other.styleStrategy;
if (family != other.family) return family < other.family; if (family != other.family) return family < other.family;
if (!styleName.isEmpty() && !other.styleName.isEmpty() && styleName != other.styleName)
return styleName < other.styleName;
if (hintingPreference != other.hintingPreference) return hintingPreference < other.hintingPreference; if (hintingPreference != other.hintingPreference) return hintingPreference < other.hintingPreference;
#ifdef Q_WS_X11 #ifdef Q_WS_X11