summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-05-03 15:03:35 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-18 10:46:44 +1000
commitaa004ff76db62cca051b43367495df264cca581c (patch)
treec86e30d06f7daba9fdba858fd32f77435748ad64
parentc631c058198a9af92bba2ce560c79f3eb31ac14a (diff)
Remove Q_ASSERT from qtesselator autotest
If the test data is incorrect, print a meaningful error message into the test output. Change-Id: I505a86b4411619d3c3be9541c96c082f92589ff7 Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern (cherry picked from commit 8e12d9e322ec7d8f7eece09b6f15cba640615f9e)
-rw-r--r--tests/auto/qtessellator/oldtessellator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qtessellator/oldtessellator.cpp b/tests/auto/qtessellator/oldtessellator.cpp
index 78f117f3e3..10b8710ccc 100644
--- a/tests/auto/qtessellator/oldtessellator.cpp
+++ b/tests/auto/qtessellator/oldtessellator.cpp
@@ -218,7 +218,8 @@ void old_tesselate_polygon(QVector<XTrapezoid> *traps, const QPointF *pg, int pg
qreal ymax(INT_MIN/256);
//painter.begin(pg, pgSize);
- Q_ASSERT(pg[0] == pg[pgSize-1]);
+ if (pg[0] != pg[pgSize-1])
+ qWarning() << Q_FUNC_INFO << "Malformed polygon (first and last points must be identical)";
// generate edge table
// qDebug() << "POINTS:";
for (int x = 0; x < pgSize-1; ++x) {