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/imports/controls/material/qquickmaterialtheme_p.h | |
| 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/imports/controls/material/qquickmaterialtheme_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialtheme_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index 571461a7..717990ad 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -60,7 +60,7 @@ public: explicit QQuickMaterialTheme(); protected: - const QFont *font(Font type) const override; + const QFont *font(Scope scope) const override; void resolveFonts(const QFont &defaultFont) override; |