diff options
| author | Jonas Karlsson <jonas.karlsson@qt.io> | 2020-08-06 16:57:50 +0200 |
|---|---|---|
| committer | Jonas Karlsson <jonas.karlsson@qt.io> | 2020-08-28 18:33:08 +0200 |
| commit | de0c76db907ffd34b10eeda4a2d1d52c107ef4bd (patch) | |
| tree | c49a4a6045971f31c36adbf69b886025ccabd2ee /src/quick/util | |
| parent | f1cc8f684cf7a72c70dfe4d9c1ca0a03ad0030a9 (diff) | |
Use OpenType font weights
Task-number: QTBUG-42248
Change-Id: Ib26d4945307b630b054e270b3213e1c9ad0d5357
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickfontloader.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickvaluetypes.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index d6858b486c..2ae5d00739 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -309,7 +309,7 @@ void QQuickFontLoader::updateFontInfo(int id) const QFontDatabasePrivate::ApplicationFont::Properties &properties = applicationFont.properties.at(0); font.setFamily(properties.familyName); font.setStyleName(properties.styleName); - font.setWeight(properties.weight); + font.setWeight(QFont::Weight(properties.weight)); font.setStyle(properties.style); font.setStretch(properties.stretch); } diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 817977eb3b..fb1645803f 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -528,7 +528,7 @@ public: if (ok) *ok = true; } if (vweight->isInt32()) { - retn.setWeight(vweight->integerValue()); + retn.setWeight(QFont::Weight(vweight->integerValue())); if (ok) *ok = true; } if (vwspac->isNumber()) { diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp index 666156d1cd..b2131b53b7 100644 --- a/src/quick/util/qquickvaluetypes.cpp +++ b/src/quick/util/qquickvaluetypes.cpp @@ -654,7 +654,7 @@ int QQuickFontValueType::weight() const void QQuickFontValueType::setWeight(int w) { - v.setWeight(qBound(0, w, 99)); + v.setWeight(QFont::Weight(w)); } bool QQuickFontValueType::italic() const |