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/qquickpopupitem.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/qquickpopupitem.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopupitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickpopupitem.cpp b/src/quicktemplates2/qquickpopupitem.cpp index aea0087f..cf2fec41 100644 --- a/src/quicktemplates2/qquickpopupitem.cpp +++ b/src/quicktemplates2/qquickpopupitem.cpp @@ -96,7 +96,7 @@ void QQuickPopupItemPrivate::resolveFont() if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window())) inheritFont(window->font()); else - inheritFont(QQuickTheme::themeFont(QQuickTheme::System)); + inheritFont(QQuickTheme::font(QQuickTheme::System)); } void QQuickPopupItemPrivate::resolvePalette() @@ -104,7 +104,7 @@ void QQuickPopupItemPrivate::resolvePalette() if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(popup->window())) inheritPalette(window->palette()); else - inheritPalette(QQuickTheme::themePalette(QQuickTheme::System)); + inheritPalette(QQuickTheme::palette(QQuickTheme::System)); } QQuickItem *QQuickPopupItemPrivate::getContentItem() |