Fix fonts and palettes in apps without :/qtquickcontrols2.conf

Obviously theme fonts and palettes must be resolved regardless of
QT_CONFIG(settings) and whether :/qtquickcontrols2.conf exists.

Change-Id: I471af2af291dc4508f2eb3985b90faa6d530f096
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp
index 287bb589..0f9bc5de 100644
--- a/src/quicktemplates2/qquicktheme.cpp
+++ b/src/quicktemplates2/qquicktheme.cpp
@@ -100,16 +100,14 @@ void QQuickTheme::setDefaultFont(const QFont *defaultFont)
 {
     Q_D(QQuickTheme);
     d->defaultFont.reset(defaultFont);
-    if (defaultFont)
-        resolveFonts(*defaultFont);
+    resolveFonts(defaultFont ? *defaultFont : QFont());
 }
 
 void QQuickTheme::setDefaultPalette(const QPalette *defaultPalette)
 {
     Q_D(QQuickTheme);
     d->defaultPalette.reset(defaultPalette);
-    if (defaultPalette)
-        resolvePalettes(*defaultPalette);
+    resolvePalettes(defaultPalette ? *defaultPalette : QPalette());
 }
 
 void QQuickTheme::resolveFonts(const QFont &defaultFont)