Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (195 commits)
  Re-apply licenseheader text in source files for qt4.8
  Revert all QScroller and QFlickGesture related code.
  Fix regression that caused waitForXXX(-1) to fail.
  Fix thread safety regression of QNetworkConfigurationManager
  Fix instability in QNetworkConfigurationManager autotest
  Support word selection list with predictive text from splitview
  Fix softkey icon positioning in S60 5.3
  QDeclarativeMouseArea: block context menu events
  ListViews loses items if all visible items are removed.
  Make TextEdit word selection more natural.
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
  Clear confusion between QMainWindow and QMainWindowLayout.
  Fix for rounded corners bug in QMenu
  Compile
  QWidgetPrivate::setParent_sys might be using null pointer
  Ensure the TextEdit cursor delegate is repositioned on mouse events.
  Don't crash on an invalid replacementStart from an input method.
  Fix QGLWidget::renderPixmap for raster engine on Mac
  Check if OES_texture_npot is present on OpenGL ES 2.
  ...

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/auto/qtessellator/dataparser.cpp b/tests/auto/qtessellator/dataparser.cpp
index 772f925..8ad7ae8 100644
--- a/tests/auto/qtessellator/dataparser.cpp
+++ b/tests/auto/qtessellator/dataparser.cpp
@@ -98,8 +98,12 @@ static QList<QPointF> parsePoints(const QByteArray &line)
     QList<qreal> nums = parseNumbersList(it);
     QList<qreal>::const_iterator nitr;
     for (nitr = nums.begin(); nitr != nums.end(); ++nitr) {
-        qreal x = *nitr; ++nitr;
-        Q_ASSERT(nitr != nums.end());
+        qreal x = *nitr;
+        ++nitr;
+        if (nitr == nums.end()) {
+            qWarning() << "parsePoints: Even number of co-ordinates required, odd number found: skipping last point";
+            break;
+        }
         qreal y = *nitr;
         res.append(QPointF(x, y));
     }