summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase.cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-05-05 02:17:56 -0700
committerJake Petroules <jake.petroules@qt.io>2016-06-01 02:29:51 +0000
commita160bd4fccaebafb5453a642f43bdefafc1e2565 (patch)
tree3e71ff16f36f49a739c724ec1d4f49ab8fa545ff /src/gui/text/qfontdatabase.cpp
parentbb30da895eca5a80265317db1fc7a0d151005e30 (diff)
Fix bugs causing Thin font weights to be ignored or mishandled.
Task-number: QTBUG-53196 Change-Id: If12b3cab3d8de5e0e452fca844b0a484c29e9e86 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
-rw-r--r--src/gui/text/qfontdatabase.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 928d1e4eb5..c4b849878c 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2730,8 +2730,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
}
if (req.pointSize < 0)
req.pointSize = req.pixelSize*72.0/d->dpi;
- if (req.weight == 0)
- req.weight = QFont::Normal;
+ req.weight = QFont::Normal;
if (req.stretch == 0)
req.stretch = 100;