summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-07-07 08:36:45 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-07 08:38:52 +0200
commit1174b69ee13d372cb01fc351d5ba158a6909744c (patch)
treec2583e6de6e891e70cb7edf88bf2407e97dc203b /src/corelib
parentc0c6dd2b022cfd667f32b8a48bcac86ac07d3880 (diff)
Fix regressions in previous QFontDatabase patch
1. QtFontStyle::Key comparison should either use styleName or style, etc., but not both. 2. When initializing a QFont from QFontDatabase::font(), style and weight parameters should always be set even when we found a match styleName, in case these parameters will be used for comparison later. 3. Move styleName out of QtFontStyle::Key so that the code can be clearer and more explicit. Change-Id: Icdee8e97568a0f31f57d2cdb8d414f47331fde75 Reviewed-by: Eskil Reviewed-on: http://codereview.qt.nokia.com/1263 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions