diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-14 14:56:00 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-15 13:00:53 +0000 |
| commit | 87d3e84c75839b736d45f2773fc5fb4ecce14296 (patch) | |
| tree | d580764ae48ed0226763b9ad56a12c566acd8a75 /src/quicktemplates2/qquickcontrol.cpp | |
| parent | 6d879ab06a95d6b49e5ca4ad0af12024d5d2a988 (diff) | |
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>
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 03a92b00..fbe46206 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -397,7 +397,7 @@ QFont QQuickControlPrivate::parentFont(const QQuickItem *item) if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window())) return window->font(); - return QQuickTheme::themeFont(QQuickTheme::SystemFont); + return QQuickTheme::themeFont(QQuickTheme::System); } /*! @@ -488,7 +488,7 @@ QPalette QQuickControlPrivate::parentPalette(const QQuickItem *item) if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window())) return window->palette(); - return QQuickTheme::themePalette(QQuickTheme::SystemPalette); + return QQuickTheme::themePalette(QQuickTheme::System); } /*! @@ -1540,12 +1540,12 @@ void QQuickControl::componentComplete() QFont QQuickControl::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::SystemFont); + return QQuickTheme::themeFont(QQuickTheme::System); } QPalette QQuickControl::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::SystemPalette); + return QQuickTheme::themePalette(QQuickTheme::System); } void QQuickControl::focusInEvent(QFocusEvent *event) |