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/qquicktextfield.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/qquicktextfield.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktextfield.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 47026e1b..06cbd5a2 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -226,9 +226,6 @@ void QQuickTextFieldPrivate::inheritFont(const QFont &font) const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextField); QFont resolvedFont = parentFont.resolve(defaultFont); - // See comment in QQuickControlPrivate::inheritFont - if (defaultFont.families().isEmpty()) - resolvedFont.setFamilies(QStringList()); setFont_helper(resolvedFont); } |