diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-08-27 09:24:15 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-08-28 13:49:09 +0200 |
| commit | dcbfb32c99818da804aabfc3821f5c23ada5686c (patch) | |
| tree | 92bc324e07a181fdde426011e828bd178d35b743 /src/quick/util/qquickfontloader.cpp | |
| parent | 8248b5a485a2b8885442d6511906526548d9d07e (diff) | |
Use QPalette::resolveMask() and setResolveMask() where necessary
This is needed after qtbase b77a3f47c9d6f4fd68a687e3bdb38e550d2810ad.
Change-Id: I41cf66d51dad7209c21d9e4049497a1f911e132a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quick/util/qquickfontloader.cpp')
| -rw-r--r-- | src/quick/util/qquickfontloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index c27ed25d41..d6858b486c 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -418,7 +418,7 @@ QFont QQuickFontLoader::font() const QString QQuickFontLoader::name() const { Q_D(const QQuickFontLoader); - return d->font.resolve() == 0 ? QString() : d->font.family(); + return d->font.resolveMask() == 0 ? QString() : d->font.family(); } /*! |