diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-16 13:57:00 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-22 14:20:53 +0000 |
commit | 1a3c1a089ff088482c9d093f4fa002e2d47cc103 (patch) | |
tree | bc6c399af2fe531de7cc4851df0efe9fc5f4170f /src/quicktemplates2/qquickpopup.cpp | |
parent | f40dc11886e8130bad5771ed80920e6e72dfc09e (diff) |
QQuickTheme: rename themeFont() and themePalette()
We don't have the conflicting virtual getters anymore.
Change-Id: Ia20bfa0a0b1aa67c35a23270eb0241018f8e0ada
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 2a02a6c1..d5e2c940 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -2649,12 +2649,12 @@ void QQuickPopup::insetChange(const QMarginsF &newInset, const QMarginsF &oldIns QFont QQuickPopup::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::System); + return QQuickTheme::font(QQuickTheme::System); } QPalette QQuickPopup::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::System); + return QQuickTheme::palette(QQuickTheme::System); } #if QT_CONFIG(accessibility) |