Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ib14b8c77cefe7aaf5b11483d9a30b2ef05314598

1 files changed, 7 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index e156fb57..0ebaf9a3 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -549,7 +549,13 @@ void QQuickControlPrivate::inheritFont(const QFont &font)
     parentFont.resolve(extra.isAllocated() ? extra->requestedFont.resolve() | font.resolve() : font.resolve());
 
     const QFont defaultFont = q->defaultFont();
-    const QFont resolvedFont = parentFont.resolve(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);
 }