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/qquickvaluetypes.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/qquickvaluetypes.cpp')
| -rw-r--r-- | src/quick/util/qquickvaluetypes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |