diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2012-09-26 10:16:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-27 21:13:52 +0200 |
| commit | 67391eedfe2ee0f39d35834e91e476872a6c1fc4 (patch) | |
| tree | 0aed129510410a00aca0f4ae1df3b51204a9c0b4 /tests/auto | |
| parent | 47d635b011f55a7386befb7247c56d1a6e6b2f05 (diff) | |
Test: Enable tst_QWMatrix::operator_star_qwmatrix
Expecting results were not correct. The test is passing.
Task-number: QTBUG-22362
Change-Id: Ie41c262019f76aace9062d7897d7934dc7437c3a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp index 31508bc0ec..e863aa68ee 100644 --- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp +++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp @@ -299,22 +299,17 @@ void tst_QWMatrix::mapRect() void tst_QWMatrix::operator_star_qwmatrix() { -#if 0 - // Left out until the matrix multiply operator behaves properly.. QMatrix m1( 2, 3, 4, 5, 6, 7 ); QMatrix m2( 3, 4, 5, 6, 7, 8 ); - QMatrix result1x2( 21, 26, 37, 46, 44, 75 ); - QMatrix result2x1( 22, 29, 34, 45, 53, 80); + QMatrix result1x2( 21, 26, 37, 46, 60, 74 ); + QMatrix result2x1( 22, 29, 34, 45, 52, 68); QMatrix product12 = m1*m2; QMatrix product21 = m2*m1; QVERIFY( product12==result1x2 ); QVERIFY( product21==result2x1 ); -#else - QSKIP( "Not tested with Qt versions since the operator is broken.." ); -#endif } |