diff options
Diffstat (limited to 'src/imports/controls')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/controls/imagine/qquickimaginetheme_p.h b/src/imports/controls/imagine/qquickimaginetheme_p.h index 3a388a86..13a62b59 100644 --- a/src/imports/controls/imagine/qquickimaginetheme_p.h +++ b/src/imports/controls/imagine/qquickimaginetheme_p.h @@ -57,10 +57,10 @@ class QQuickImagineTheme : public QQuickTheme public: explicit QQuickImagineTheme(); - const QFont *font(Font type = SystemFont) const override; - const QPalette *palette(Palette type = SystemPalette) const override; - protected: + const QFont *font(Font type) const override; + const QPalette *palette(Palette type) const override; + void resolveFonts(const QFont &defaultFont) override; void resolvePalettes(const QPalette &defaultPalette) override; 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: diff --git a/src/imports/controls/qquickdefaulttheme_p.h b/src/imports/controls/qquickdefaulttheme_p.h index 05c1c344..161dd57f 100644 --- a/src/imports/controls/qquickdefaulttheme_p.h +++ b/src/imports/controls/qquickdefaulttheme_p.h @@ -57,9 +57,9 @@ class QQuickDefaultTheme : public QQuickTheme public: explicit QQuickDefaultTheme(); +protected: const QPalette *palette(Palette type) const override; -protected: void resolvePalettes(const QPalette &defaultPalette) override; private: diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h index 3a4cc792..fe547ccd 100644 --- a/src/imports/controls/universal/qquickuniversaltheme_p.h +++ b/src/imports/controls/universal/qquickuniversaltheme_p.h @@ -58,9 +58,9 @@ class QQuickUniversalTheme : public QQuickTheme public: explicit QQuickUniversalTheme(); - const QFont *font(Font type = SystemFont) const override; - protected: + const QFont *font(Font type) const override; + void resolveFonts(const QFont &defaultFont) override; private: |