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/qquicktumbler.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/qquicktumbler.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktumbler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquicktumbler.cpp b/src/quicktemplates2/qquicktumbler.cpp index f2797c29..4dc294e7 100644 --- a/src/quicktemplates2/qquicktumbler.cpp +++ b/src/quicktemplates2/qquicktumbler.cpp @@ -830,12 +830,12 @@ void QQuickTumbler::updatePolish() QFont QQuickTumbler::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::TumblerFont); + return QQuickTheme::themeFont(QQuickTheme::Tumbler); } QPalette QQuickTumbler::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::TumblerPalette); + return QQuickTheme::themePalette(QQuickTheme::Tumbler); } QQuickTumblerAttachedPrivate::QQuickTumblerAttachedPrivate() |