diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 23:11:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 23:11:26 (GMT) |
| commit | 1f6af025927bbba757ec78d85c3f2a179eff68b8 (patch) | |
| tree | be106d4f98f58308a66a26ce21f22b2fef8e5516 /tests | |
| parent | b1494900fd45c38e8c21f30311a642981c0fd795 (diff) | |
| parent | c30714122c58a3dc6fd8401427da60c4afc4127b (diff) | |
| download | Qt-1f6af025927bbba757ec78d85c3f2a179eff68b8.zip Qt-1f6af025927bbba757ec78d85c3f2a179eff68b8.tar.gz Qt-1f6af025927bbba757ec78d85c3f2a179eff68b8.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:
Prevented infinite recursion in QPainterPath::contains().
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpainterpath/tst_qpainterpath.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/qpainterpath/tst_qpainterpath.cpp index 00f9b91..4ade9ad 100644 --- a/tests/auto/qpainterpath/tst_qpainterpath.cpp +++ b/tests/auto/qpainterpath/tst_qpainterpath.cpp @@ -290,6 +290,11 @@ void tst_QPainterPath::contains_QPointF_data() QTest::newRow("horizontal cubic, out left") << path << QPointF(0, 100) << false; QTest::newRow("horizontal cubic, out right") << path << QPointF(300, 100) <<false; QTest::newRow("horizontal cubic, in mid") << path << QPointF(150, 100) << true; + + path = QPainterPath(); + path.addEllipse(QRectF(-5000.0, -5000.0, 1500000.0, 1500000.0)); + QTest::newRow("huge ellipse, qreal=float crash") << path << QPointF(1100000.35, 1098000.2) << true; + } void tst_QPainterPath::contains_QPointF() |