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, 6 insertions, 2 deletions

diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp
index 0e89bb7f..f2deb7ba 100644
--- a/src/quickcontrols2/qquickstyleplugin.cpp
+++ b/src/quickcontrols2/qquickstyleplugin.cpp
@@ -149,13 +149,17 @@ void QQuickStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
     if (isCurrent()) {
         m_theme.reset(createTheme());
         if (m_theme) {
+            const QFont *font = nullptr;
+            const QPalette *palette = nullptr;
 #if QT_CONFIG(settings)
             QSharedPointer<QSettings> settings = QQuickStylePrivate::settings(name());
             if (settings) {
-                m_theme->setDefaultFont(readFont(settings));
-                m_theme->setDefaultPalette(readPalette(settings));
+                font = readFont(settings);
+                palette = readPalette(settings);
             }
 #endif
+            m_theme->setDefaultFont(font);
+            m_theme->setDefaultPalette(palette);
             QGuiApplicationPrivate::platform_theme = m_theme.data();
         }
     }