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 | |
| 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')
| -rw-r--r-- | src/quick/items/qquickpalettecolorprovider.cpp | 4 | ||||
| -rw-r--r-- | src/quick/util/qquickfontloader.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickvaluetypes.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickpalettecolorprovider.cpp b/src/quick/items/qquickpalettecolorprovider.cpp index 6808e8843a..2eef1dce63 100644 --- a/src/quick/items/qquickpalettecolorprovider.cpp +++ b/src/quick/items/qquickpalettecolorprovider.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE static bool notEq(const QPalette &p1, const QPalette &p2) { - return p1.resolve() != p2.resolve() || p1 != p2; + return p1.resolveMask() != p2.resolveMask() || p1 != p2; } static QPalette::ColorGroup adjustCg(QPalette::ColorGroup group) @@ -134,7 +134,7 @@ bool QQuickPaletteColorProvider::reset() bool QQuickPaletteColorProvider::inheritPalette(const QPalette &p) { QPalette parentPalette = m_requestedPalette.isAllocated() ? m_requestedPalette->resolve(p) : p; - parentPalette.resolve(m_requestedPalette.isAllocated() ? m_requestedPalette->resolve() | p.resolve() : p.resolve()); + parentPalette.setResolveMask(m_requestedPalette.isAllocated() ? m_requestedPalette->resolveMask() | p.resolveMask() : p.resolveMask()); auto tmpResolvedPalette = parentPalette.resolve(paletteProvider()->defaultPalette()); 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(); } /*! diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp index 8fc108de8c..666156d1cd 100644 --- a/src/quick/util/qquickvaluetypes.cpp +++ b/src/quick/util/qquickvaluetypes.cpp @@ -707,7 +707,7 @@ qreal QQuickFontValueType::pointSize() const void QQuickFontValueType::setPointSize(qreal size) { - if ((v.resolve() & QFont::SizeResolved) && v.pixelSize() != -1) { + if ((v.resolveMask() & QFont::SizeResolved) && v.pixelSize() != -1) { qWarning() << "Both point size and pixel size set. Using pixel size."; return; } @@ -728,7 +728,7 @@ int QQuickFontValueType::pixelSize() const void QQuickFontValueType::setPixelSize(int size) { if (size >0) { - if ((v.resolve() & QFont::SizeResolved) && v.pointSizeF() != -1) + if ((v.resolveMask() & QFont::SizeResolved) && v.pointSizeF() != -1) qWarning() << "Both point size and pixel size set. Using pixel size."; v.setPixelSize(size); } |