aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialtheme_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-03-14 13:24:10 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2018-03-15 07:50:40 +0000
commit6d879ab06a95d6b49e5ca4ad0af12024d5d2a988 (patch)
tree9b10d4c7a7350ee9cc3c82f4847cbcaedbbca4b9 /src/imports/controls/material/qquickmaterialtheme_p.h
parent63773fd5363e8954e298e775bba7478d612134ef (diff)
QQuickTheme: cleanup the API
Task-number: QTBUG-67062 Change-Id: Id2f821bd41b72f7bce9885295e89c322eb3332f4 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h
index 8df1f962..571461a7 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/src/imports/controls/material/qquickmaterialtheme_p.h
@@ -59,9 +59,9 @@ class QQuickMaterialTheme : public QQuickTheme
public:
explicit QQuickMaterialTheme();
- const QFont *font(Font type = SystemFont) const override;
-
protected:
+ const QFont *font(Font type) const override;
+
void resolveFonts(const QFont &defaultFont) override;
private: