diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 16:04:57 (GMT) |
| commit | 3a6bbedcea2b5ef15077a67c58e9e59abe904014 (patch) | |
| tree | c2199f9faa005e5082e9fe419fea3b4e85e4c6e7 /src/gui/painting/qpainterpath.cpp | |
| parent | 84b5bbc77045cdc267626ff86f309664283abed4 (diff) | |
| parent | 8aa9c7638080e56b124f6542699c45dfbcbba2c0 (diff) | |
| download | Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.zip Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.gz Qt-3a6bbedcea2b5ef15077a67c58e9e59abe904014.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/painting/qpainterpath.cpp')
| -rw-r--r-- | src/gui/painting/qpainterpath.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 7d6ea12..3a9afe1 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -1204,7 +1204,8 @@ void QPainterPath::connectPath(const QPainterPath &other) int first = d->elements.size(); d->elements += other.d_func()->elements; - d->elements[first].type = LineToElement; + if (first != 0) + d->elements[first].type = LineToElement; // avoid duplicate points if (first > 0 && QPointF(d->elements[first]) == QPointF(d->elements[first - 1])) { |