diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-11 03:04:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-11 03:04:32 +0100 |
| commit | 90d672d6c72990e5340c2bc3ddcc106c288d0cd8 (patch) | |
| tree | e498c4b32aab0504d971f8eea5bac34ea506b68f | |
| parent | e3a44489b8ed90ed7f3e231afeaece5ea732ac0f (diff) | |
| parent | b9168439a185755ef9110ffb898ab14f4e19cfcb (diff) | |
| download | qtscript-90d672d6c72990e5340c2bc3ddcc106c288d0cd8.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib47f269c82616d5fd300d137471b5878ca983341
| -rw-r--r-- | examples/script/context2d/context2d.cpp | 6 | ||||
| -rw-r--r-- | examples/script/context2d/context2d.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp index 5b8b9f6..beaa717 100644 --- a/examples/script/context2d/context2d.cpp +++ b/examples/script/context2d/context2d.cpp @@ -245,7 +245,7 @@ void Context2D::translate(qreal x, qreal y) void Context2D::transform(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy) { - QMatrix mat(m11, m12, + QTransform mat(m11, m12, m21, m22, dx, dy); m_state.matrix *= mat; @@ -256,7 +256,7 @@ void Context2D::transform(qreal m11, qreal m12, qreal m21, qreal m22, void Context2D::setTransform(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy) { - QMatrix mat(m11, m12, + QTransform mat(m11, m12, m21, m22, dx, dy); m_state.matrix = mat; @@ -730,7 +730,7 @@ void Context2D::clear() void Context2D::reset() { m_stateStack.clear(); - m_state.matrix = QMatrix(); + m_state.matrix = QTransform(); m_state.clipPath = QPainterPath(); m_state.globalAlpha = 1.0; m_state.globalCompositeOperation = QPainter::CompositionMode_SourceOver; diff --git a/examples/script/context2d/context2d.h b/examples/script/context2d/context2d.h index f7f8722..108e6b5 100644 --- a/examples/script/context2d/context2d.h +++ b/examples/script/context2d/context2d.h @@ -244,7 +244,7 @@ private: struct State { State() : flags(0) {} - QMatrix matrix; + QTransform matrix; QPainterPath clipPath; QBrush strokeStyle; QBrush fillStyle; |