summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfont.cpp
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-06-23 12:19:48 (GMT)
committerJiang Jiang <jiang.jiang@nokia.com>2011-06-25 12:21:22 (GMT)
commit1481955dd93acea1c5cf684e3f753d80f614e9bf (patch)
tree9a0835d54343b7d86d0d7e6eb6cfc403017ddf25 /src/gui/text/qfont.cpp
parentbc730b8a703856559980adadddda745405e9b806 (diff)
downloadQt-1481955dd93acea1c5cf684e3f753d80f614e9bf.zip
Qt-1481955dd93acea1c5cf684e3f753d80f614e9bf.tar.gz
Qt-1481955dd93acea1c5cf684e3f753d80f614e9bf.tar.bz2
Add styleName to QFontDef comparison
To make sure we cache different font engines with different style names. Task-number: QTBUG-19366
Diffstat (limited to 'src/gui/text/qfont.cpp')
-rw-r--r--src/gui/text/qfont.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index d4c81b9..e771b07 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -147,6 +147,7 @@ bool QFontDef::exactMatch(const QFontDef &other) const
&& weight == other.weight
&& style == other.style
&& this_family == other_family
+ && styleName == other.styleName
&& (this_foundry.isEmpty()
|| other_foundry.isEmpty()
|| this_foundry == other_foundry)