Add QQuickTheme::Scope

Replace the old enums that were originally copied from QPlatformTheme,
including irrelevant entries for DockWidget, MdiSubWindow, MessageBox,
with a unified enum that will be matched to cover everything needed
for theming fonts and palettes for Qt Quick Controls 2.

Task-number: QTBUG-67062
Change-Id: Ia99d092f28c00210c0c7f24d4241eb5a5d9ceb5b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 370f47bb..edbc9e91 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -274,7 +274,7 @@ void QQuickApplicationWindowPrivate::updateFont(const QFont &f)
 
 void QQuickApplicationWindowPrivate::resolveFont()
 {
-    QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::SystemFont));
+    QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::System));
     setFont_helper(resolvedFont);
 }
 
@@ -296,7 +296,7 @@ void QQuickApplicationWindowPrivate::updatePalette(const QPalette &p)
 
 void QQuickApplicationWindowPrivate::resolvePalette()
 {
-    QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::SystemPalette));
+    QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::System));
     setPalette_helper(resolvedPalette);
 }
 
@@ -691,7 +691,7 @@ void QQuickApplicationWindow::setFont(const QFont &font)
     if (d->font.resolve() == font.resolve() && d->font == font)
         return;
 
-    QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::SystemFont));
+    QFont resolvedFont = font.resolve(QQuickTheme::themeFont(QQuickTheme::System));
     d->setFont_helper(resolvedFont);
 }
 
@@ -770,7 +770,7 @@ void QQuickApplicationWindow::setPalette(const QPalette &palette)
     if (d->palette.resolve() == palette.resolve() && d->palette == palette)
         return;
 
-    QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::SystemPalette));
+    QPalette resolvedPalette = palette.resolve(QQuickTheme::themePalette(QQuickTheme::System));
     d->setPalette_helper(resolvedPalette);
 }