Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging: (114 commits)
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
  Remove Q_ASSERT's from qsharedmemory autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT's from qabstractxmlnodemodel test
  Remove Q_ASSERT from QXmlStream autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QItemModel autotest
  Remove Q_ASSERT's from qxmlquery autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from qabstractxmlnodemodel test
  Remove Q_ASSERT from qscriptvaluegenerated test
  Remove Q_ASSERT from QVariant autotest
  Remove Q_ASSERT's from QTreeView autotest
  Remove Q_ASSERT from qtesselator autotest
  Remove unused function from qtessellator autotest
  Remove Q_ASSERT from qscriptvaluegenerated test
  Remove Q_ASSERT's from qscriptvaluegenerated test
  ...

1 files changed, 3 insertions, 1 deletions

diff --git a/tests/auto/qtessellator/testtessellator.cpp b/tests/auto/qtessellator/testtessellator.cpp
index 339f05f..d8d6f6f 100644
--- a/tests/auto/qtessellator/testtessellator.cpp
+++ b/tests/auto/qtessellator/testtessellator.cpp
@@ -42,6 +42,7 @@
 #include <private/qtessellator_p.h>
 
 #include "math.h"
+#include <QtCore/QDebug>
 
 class TestTessellator : public QTessellator
 {
@@ -91,7 +92,8 @@ void test_tessellate_polygon_rect(QVector<XTrapezoid> *traps, const QPointF *poi
                                   bool winding)
 {
     // 5 points per rect
-    Q_ASSERT(nPoints % 5 == 0);
+    if (nPoints % 5 != 0)
+        qWarning() << Q_FUNC_INFO << "multiples of 5 points expected";
 
     TestTessellator t;
     t.traps = traps;