diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-11 10:39:20 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-15 17:44:48 +0200 |
| commit | 82f19b9d594e26a9538f2135eb0fcfa357f4c693 (patch) | |
| tree | f4e7bf5d4f112bd8bd3a5dfc15353623b7917b48 /src/quicktemplates2/qquickapplicationwindow.cpp | |
| parent | b0b11a6d4ae8a03998a5c84b91d9cb0b75387059 (diff) | |
Fix build after qtbase API changes
Adjust to API changes in qtbase
Change-Id: Ib7d97c9580651077103b8ddeca28c30fb4992cb6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index 3d39a04e..c825a063 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -147,7 +147,7 @@ public: void updateFont(const QFont &f); inline void setFont_helper(const QFont &f) { - if (font.resolve() == f.resolve() && font == f) + if (font.resolveMask() == f.resolveMask() && font == f) return; updateFont(f); } @@ -611,7 +611,7 @@ QFont QQuickApplicationWindow::font() const void QQuickApplicationWindow::setFont(const QFont &font) { Q_D(QQuickApplicationWindow); - if (d->font.resolve() == font.resolve() && d->font == font) + if (d->font.resolveMask() == font.resolveMask() && d->font == font) return; QFont resolvedFont = font.resolve(QQuickTheme::font(QQuickTheme::System)); |