diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 11:22:32 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-04 22:49:31 +0000 |
| commit | d5ac97e36fb35761576f25c84372d5c477189a0f (patch) | |
| tree | b3f8710c3c36944fbfcbbdafc7fdef44d06b45d1 | |
| parent | fd70978693bd92761e9989bc1c76bf83c1e8c987 (diff) | |
Fix font-weight regression
Do not override the requested font-weight. This was a wrong rewrite of
a now redundant if-statement.
Change-Id: I20a745cac02d896fdeaa853f20c6b6647084fceb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index c4b849878c..7b88a73c61 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -2730,7 +2730,6 @@ void QFontDatabase::load(const QFontPrivate *d, int script) } if (req.pointSize < 0) req.pointSize = req.pixelSize*72.0/d->dpi; - req.weight = QFont::Normal; if (req.stretch == 0) req.stretch = 100; |