diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 13:43:27 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 13:43:27 +1000 |
| commit | 14de8cecfa5b5428d597c9cca111ee0f3f89502f (patch) | |
| tree | 1106e55230630e9c801079280cc674ade9bfc625 /tests/auto/qgraphicstransform | |
| parent | 56ca8ea340aa55071c7d616e421d67a3d3622058 (diff) | |
| parent | 538a415b8296db36355609d6e84137b9354967a7 (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add missing test file.
Changing width of RTL positioner doesn't relayout
Fix TextInput auto test failure on mac.
PinchArea and Flickable don't work well enough together
Fix auto test failure.
Once Image sourceSize is set there is no way to clear it.
Rotation transform with NaN angle can cause crash
Canceling image download while reading causes crash
Fix width of TextInput micro focus rectangle.
Diffstat (limited to 'tests/auto/qgraphicstransform')
| -rw-r--r-- | tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp index 9434a0b6a4..903d7e796c 100644 --- a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp +++ b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp @@ -225,6 +225,10 @@ void tst_QGraphicsTransform::rotation() rotation.setAngle(90); QCOMPARE(transform2D(rotation).map(QPointF(10, 10)), QPointF(10, 10)); QCOMPARE(transform2D(rotation).map(QPointF(20, 10)), QPointF(10, 20)); + + rotation.setOrigin(QVector3D(0, 0, 0)); + rotation.setAngle(qQNaN()); + QCOMPARE(transform2D(rotation).map(QPointF(20, 10)), QPointF(20, 10)); } Q_DECLARE_METATYPE(Qt::Axis); |