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/qquickcontrol.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/qquickcontrol.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 7174ba35..14887a07 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -515,7 +515,7 @@ QFont QQuickControlPrivate::parentFont(const QQuickItem *item) if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window())) return window->font(); - return QQuickTheme::themeFont(QQuickTheme::System); + return QQuickTheme::font(QQuickTheme::System); } /*! @@ -606,7 +606,7 @@ QPalette QQuickControlPrivate::parentPalette(const QQuickItem *item) if (QQuickApplicationWindow *window = qobject_cast<QQuickApplicationWindow *>(item->window())) return window->palette(); - return QQuickTheme::themePalette(QQuickTheme::System); + return QQuickTheme::palette(QQuickTheme::System); } /*! @@ -2012,12 +2012,12 @@ void QQuickControl::componentComplete() QFont QQuickControl::defaultFont() const { - return QQuickTheme::themeFont(QQuickTheme::System); + return QQuickTheme::font(QQuickTheme::System); } QPalette QQuickControl::defaultPalette() const { - return QQuickTheme::themePalette(QQuickTheme::System); + return QQuickTheme::palette(QQuickTheme::System); } void QQuickControl::focusInEvent(QFocusEvent *event) |