diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-16 13:50:28 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-16 13:50:28 (GMT) |
| commit | 30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4 (patch) | |
| tree | 6b8adae6b69e3fdc5d6cdd65b79307229957d421 /src/gui/painting/qstroker.cpp | |
| parent | 3e7c69afd0c69b2fffccf4e8cb6f292366f3217f (diff) | |
| parent | 53352584bbf81b577998b9f5a7dd2f7191870754 (diff) | |
| download | Qt-30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4.zip Qt-30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4.tar.gz Qt-30b2a2669c03a3a0fc6a0cbb82ae1875121e2fb4.tar.bz2 | |
Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into 13092010doc
Diffstat (limited to 'src/gui/painting/qstroker.cpp')
| -rw-r--r-- | src/gui/painting/qstroker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index eabbd8a..9cff339 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -609,7 +609,7 @@ void QStroker::joinPoints(qfixed focal_x, qfixed focal_y, const QLineF &nextLine } QLineF miterLine(QPointF(qt_fixed_to_real(focal_x), qt_fixed_to_real(focal_y)), isect); - if (miterLine.length() > qt_fixed_to_real(m_strokeWidth * m_miterLimit) / 2) { + if (type == QLineF::NoIntersection || miterLine.length() > qt_fixed_to_real(m_strokeWidth * m_miterLimit) / 2) { emitLineTo(qt_real_to_fixed(nextLine.x1()), qt_real_to_fixed(nextLine.y1())); } else { |