From 1a3c1a089ff088482c9d093f4fa002e2d47cc103 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 16 May 2018 13:57:00 +0200 Subject: QQuickTheme: rename themeFont() and themePalette() We don't have the conflicting virtual getters anymore. Change-Id: Ia20bfa0a0b1aa67c35a23270eb0241018f8e0ada Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickmenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quicktemplates2/qquickmenu.cpp') diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 702c1db6..f52405c9 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -1444,12 +1444,12 @@ void QQuickMenu::timerEvent(QTimerEvent *event) QFont QQuickMenu::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::Menu); + return QQuickTheme::font(QQuickTheme::Menu); } QPalette QQuickMenu::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::Menu); + return QQuickTheme::palette(QQuickTheme::Menu); } #if QT_CONFIG(accessibility) -- cgit v1.2.3