diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 13:27:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 13:27:18 (GMT) |
| commit | 2c8845bed37a9d81a21078bf95f8d6d2e6e8c0e8 (patch) | |
| tree | 64645d04170b7e0fcf9aac18f0de9a22772e30c2 /tests | |
| parent | 8b1a4e9ebeb07ed05ef99d7fe2fc19b0157aa77d (diff) | |
| parent | 45bd1e737f2f76bbc9943995734c6ecb0a23935b (diff) | |
| download | Qt-2c8845bed37a9d81a21078bf95f8d6d2e6e8c0e8.zip Qt-2c8845bed37a9d81a21078bf95f8d6d2e6e8c0e8.tar.gz Qt-2c8845bed37a9d81a21078bf95f8d6d2e6e8c0e8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed infinite loop in QPainterPath::intersects() when qreal=float.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpainterpath/tst_qpainterpath.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/qpainterpath/tst_qpainterpath.cpp index 4ade9ad..bc3b5d9 100644 --- a/tests/auto/qpainterpath/tst_qpainterpath.cpp +++ b/tests/auto/qpainterpath/tst_qpainterpath.cpp @@ -411,6 +411,10 @@ void tst_QPainterPath::intersects_QRectF_data() QTest::newRow("horizontal line") << linePath(0, 0, 10, 0) << QRectF(1, -1, 2, 2) << true; QTest::newRow("vertical line") << linePath(0, 0, 0, 10) << QRectF(-1, 1, 2, 2) << true; + + path = QPainterPath(); + path.addEllipse(QRectF(-5000.0, -5000.0, 1500000.0, 1500000.0)); + QTest::newRow("huge ellipse, qreal=float crash") << path << QRectF(1100000.35, 1098000.2, 1500000.0, 1500000.0) << true; } void tst_QPainterPath::intersects_QRectF() |