diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 19:22:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 19:22:58 (GMT) |
| commit | 276ab224a9bfcf77814e59fe36e4dd05c3723d99 (patch) | |
| tree | 2d9d3a5f3202e58786117eef3f9e1463a9b2157b /tests | |
| parent | f4053c19b3e5584f97cfb0eb14d4b488259291b4 (diff) | |
| parent | 4fc638c0b4562f4b1e9c9a367535e4b570602942 (diff) | |
| download | Qt-276ab224a9bfcf77814e59fe36e4dd05c3723d99.zip Qt-276ab224a9bfcf77814e59fe36e4dd05c3723d99.tar.gz Qt-276ab224a9bfcf77814e59fe36e4dd05c3723d99.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed bug in QTransform::type() after using operator/ or operator*.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtransform/tst_qtransform.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qtransform/tst_qtransform.cpp b/tests/auto/qtransform/tst_qtransform.cpp index 827a486..a3ded8e 100644 --- a/tests/auto/qtransform/tst_qtransform.cpp +++ b/tests/auto/qtransform/tst_qtransform.cpp @@ -610,6 +610,11 @@ void tst_QTransform::types() m4.rotate(45); QCOMPARE(m4.type(), QTransform::TxRotate); + + QTransform m5; + m5.scale(5, 5); + m5 = m5.adjoint() / m5.determinant(); + QCOMPARE(m5.type(), QTransform::TxScale); } |