diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-06-27 10:15:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-27 12:22:24 +0200 |
| commit | bb6be57b38808273b3d302a782d68f31b3076894 (patch) | |
| tree | 2845e59e1ac8ab8a3c404bd4c4f9b79acebe4c34 /src/gui/text/qfont_p.h | |
| parent | f1c49cd12d707901192648b41b4fc0d76660acd8 (diff) | |
Only compare styleNames if they are not empty
Task-number: QTBUG-19366
(cherry picked from commit 15e6ac8f4d9e7a419cd0c10405954bde78559fac)
Change-Id: I5f06bb5133f23dbc8ad6d745d44ca0a85ef49686
Reviewed-on: http://codereview.qt.nokia.com/760
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui/text/qfont_p.h')
| -rw-r--r-- | src/gui/text/qfont_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index 4ae31c38d6..ebc842c794 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -113,7 +113,7 @@ struct QFontDef && styleStrategy == other.styleStrategy && ignorePitch == other.ignorePitch && fixedPitch == other.fixedPitch && family == other.family - && styleName == other.styleName + && (styleName.isEmpty() || other.styleName.isEmpty() || styleName == other.styleName) && hintingPreference == other.hintingPreference #ifdef Q_WS_X11 && addStyle == other.addStyle |