diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-01-10 12:41:06 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-01-10 17:57:50 +0100 |
| commit | b9168439a185755ef9110ffb898ab14f4e19cfcb (patch) | |
| tree | 6ab368519140105f1b86a7776f6a0b7a89788d39 | |
| parent | 4579c6eba8ca323f98b25a5aa8032a771e857c2b (diff) | |
| download | qtscript-b9168439a185755ef9110ffb898ab14f4e19cfcb.tar.gz | |
Don't use deprecated QMatrix class anymore
Task-number: QTBUG-46653
Change-Id: I938b17f82bf0eaba7b222fc758e08e6b6eed4748
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -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; |