diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 17:54:40 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 17:54:40 (GMT) |
commit | 69c9b5b45393ebd2e2e50f1bb316cf4fc8ee9b73 (patch) | |
tree | 681d8cd0d2ba4630363a1d65e5d7d91543774521 /src/gui | |
parent | faf129a7c4f49458261ed174890602d290d1a9c2 (diff) | |
parent | 872d6d713d4c0d61308b51bf781f5b44763d927b (diff) | |
download | Qt-69c9b5b45393ebd2e2e50f1bb316cf4fc8ee9b73.zip Qt-69c9b5b45393ebd2e2e50f1bb316cf4fc8ee9b73.tar.gz Qt-69c9b5b45393ebd2e2e50f1bb316cf4fc8ee9b73.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed a stupid typo
Fixed QPainterPath::pointAtPercent(t) for one-element paths.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/painting/qpainterpath.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 9f49b2f..3d532d2 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -2923,9 +2923,12 @@ QPointF QPainterPath::pointAtPercent(qreal t) const return QPointF(); } - if (isEmpty()) + if (!d_ptr || d_ptr->elements.size() == 0) return QPointF(); + if (d_ptr->elements.size() == 1) + return d_ptr->elements.at(0); + qreal totalLength = length(); qreal curLen = 0; qreal bezierLen = 0; |