6 files changed, 0 insertions, 20 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index c825a063..d4e0a769 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -615,9 +615,6 @@ void QQuickApplicationWindow::setFont(const QFont &font)
         return;
 
     QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System));
-    // See comment in QQuickControlPrivate::inheritFont
-    if (font.families().isEmpty())
-        resolvedFont.setFamilies(QStringList());
     d->setFont_helper(resolvedFont);
 }
 
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);
 }
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index 183b0f80..2cf3be16 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -184,9 +184,6 @@ void QQuickLabelPrivate::inheritFont(const QFont &font)
 
     const QFont defaultFont = QQuickTheme::font(QQuickTheme::Label);
     QFont resolvedFont = parentFont.resolve(defaultFont);
-    // See comment in QQuickControlPrivate::inheritFont
-    if (defaultFont.families().isEmpty())
-        resolvedFont.setFamilies(QStringList());
 
     setFont_helper(resolvedFont);
 }
diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp
index a740447f..bcc08c05 100644
--- a/src/quicktemplates2/qquicktextarea.cpp
+++ b/src/quicktemplates2/qquicktextarea.cpp
@@ -264,9 +264,6 @@ void QQuickTextAreaPrivate::inheritFont(const QFont &font)
 
     const QFont defaultFont = QQuickTheme::font(QQuickTheme::TextArea);
     QFont resolvedFont = parentFont.resolve(defaultFont);
-    // See comment in QQuickControlPrivate::inheritFont
-    if (defaultFont.families().isEmpty())
-        resolvedFont.setFamilies(QStringList());
 
     setFont_helper(resolvedFont);
 }
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);
 }
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp
index b80e87e6..5ddc6f30 100644
--- a/src/quicktemplates2/qquicktheme.cpp
+++ b/src/quicktemplates2/qquicktheme.cpp
@@ -166,8 +166,6 @@ void QQuickTheme::setFont(Scope scope, const QFont &font)
 {
     Q_D(QQuickTheme);
     d->fonts[scope] = QSharedPointer<QFont>::create(d->defaultFont ? d->defaultFont->resolve(font) : font);
-    // See comment in QQuickControlPrivate::inheritFont
-    d->fonts[scope]->setFamilies(QStringList());
 }
 
 void QQuickTheme::setPalette(Scope scope, const QPalette &palette)