diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-09-02 11:49:49 +0200 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-09-03 07:31:45 +0200 |
commit | 0e0149c64dc9b4cf46f4e8f01e5680e7ea5372c4 (patch) | |
tree | ac2e3fb9a0eda3a2f67885d201fa448a049edb78 /tests/auto/tools/uic | |
parent | 6bbf3f0257603eb39d5511910e8bee1ed862b6cf (diff) |
Ignore weight in .ui files instead of converting it
In 3558704ed5c3d2c6dc6d024dfa454997469ca75f, we added code to
support old .ui files which used the old integer scale for font
weights by checking for a special attribute which would help
separate new and old files.
Since then, it has become apparent that the weight element in
.ui is not actually used for anything, since it is only emitted
when the bold flag is set and always has to match QFont::Bold
in these cases.
So instead of converting, we simply ignore it now, and respect
the bold flag instead.
This also reverts the changes to ui4.* in uic, since the
scale attribute is no longer needed.
Task-number: QTBUG-42248
Change-Id: I1898868b58004099590f4eaf01f24c57bd34d779
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/tools/uic')
-rw-r--r-- | tests/auto/tools/uic/baseline/authenticationdialog.ui.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h index 3ff68e25e3..0c34b89ce7 100644 --- a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h +++ b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h @@ -84,7 +84,6 @@ public: siteDescription->setObjectName(QString::fromUtf8("siteDescription")); QFont font; font.setBold(true); - font.setWeight(QFont::Weight(700)); siteDescription->setFont(font); siteDescription->setWordWrap(true); |