diff options
author | Andy Shaw <andy.shaw@qt.io> | 2020-11-25 14:00:11 +0100 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2020-11-30 07:36:07 +0100 |
commit | e32947d25245bdf5ca9b969e82c4e66de48957bb (patch) | |
tree | 4eaef81431c370d1c39d340a6a79144f82155315 /src/quicktemplates2/qquickcontrol.cpp | |
parent | 198db199e5e9f7f6bf8c2a8fdd870d46c5615256 (diff) |
Make adjustments for using QFont::setFamilies()
Since we only depend on using setFamilies() now instead of setFamily()
then we can rely on the fact that it will be resolved correctly, so we
can remove the code that was ensuring that family() would take
precedence if families() was empty.
Change-Id: Iea1464ec840dc76c04a4acae445cab367e03d3ca
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 72d2f794..c07a097b 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -564,12 +564,6 @@ void QQuickControlPrivate::inheritFont(const QFont &font) const QFont defaultFont = q->defaultFont(); QFont resolvedFont = parentFont.resolve(defaultFont); - // Since resolving the font will put the family() into the - // families() list if it is empty then we need to unset it - // so it does not act as if the font has changed (when it - // has not actually changed) - if (defaultFont.families().isEmpty()) - resolvedFont.setFamilies(QStringList()); setFont_helper(resolvedFont); } |