diff options
author | Gunnar Sletta <gunnar@sletta.org> | 2016-08-11 10:53:58 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar@sletta.org> | 2016-08-12 12:18:27 +0000 |
commit | 87c23b33b7293a43a851a6e43a0ddc6ef44c17e4 (patch) | |
tree | 7ffd64f448c3c8e19c7032f22491d008ed8a2a5f /src | |
parent | 829c8faee2bd3eed6b62325290f16738e2b5cf5e (diff) |
Fix 'lighter' compositionmode in Context2D
'lighter' is defined as Source + Destination which is the equivalent
of QPainter::CompositionMode_Plus.
Change-Id: I88857ffbabe319e955f588b6d74bc96da8714f3d
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index b924701f2b..c26f641754 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -794,7 +794,7 @@ static QPainter::CompositionMode qt_composite_mode_from_string(const QString &co } else if (compositeOperator == QLatin1String("destination-over")) { return QPainter::CompositionMode_DestinationOver; } else if (compositeOperator == QLatin1String("lighter")) { - return QPainter::CompositionMode_Lighten; + return QPainter::CompositionMode_Plus; } else if (compositeOperator == QLatin1String("copy")) { return QPainter::CompositionMode_Source; } else if (compositeOperator == QLatin1String("xor")) { @@ -857,7 +857,7 @@ static QString qt_composite_mode_to_string(QPainter::CompositionMode op) case QPainter::CompositionMode_Xor: return QStringLiteral("xor"); case QPainter::CompositionMode_Plus: - return QStringLiteral("plus"); + return QStringLiteral("lighter"); case QPainter::CompositionMode_Multiply: return QStringLiteral("qt-multiply"); case QPainter::CompositionMode_Screen: |