diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2020-10-28 16:31:44 +0100 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2020-11-11 12:48:21 +0100 |
commit | 7aa68ee6f2e08ce0b4f5c698a8c012895f738dd2 (patch) | |
tree | 2bcb5bdac9770777fd4888cd2841548de78888e8 /tests/auto/gui | |
parent | bd3a1dd9c287e0a1c35d013c57d83a55de52a470 (diff) |
Fix misidentification of some shearing QTransforms as only rotating
The dot product used rows instead of columns.
Pick-to: 5.15 5.12
Fixes: QTBUG-87984
Change-Id: I922f67ed0fa9a4f88aa4e9fc6d3c09f8dda21688
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r-- | tests/auto/gui/painting/qtransform/tst_qtransform.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp index 2dcb564e2b..a3ff1b0081 100644 --- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp +++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp @@ -384,8 +384,9 @@ void tst_QTransform::types() QCOMPARE(m1.inverted().type(), QTransform::TxScale); m1.rotate(45.0f); - QCOMPARE(m1.type(), QTransform::TxRotate); - QCOMPARE(m1.inverted().type(), QTransform::TxRotate); + // Rotation after non-uniform scaling -> shearing. Uniform scale + rotate tested below. + QCOMPARE(m1.type(), QTransform::TxShear); + QCOMPARE(m1.inverted().type(), QTransform::TxShear); m1.shear(0.5f, 0.25f); QCOMPARE(m1.type(), QTransform::TxShear); |