diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-12-04 14:02:35 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-12-04 14:02:35 (GMT) |
| commit | 33441e2a611f07207b0b942368aab9010cdf8ab1 (patch) | |
| tree | 77a223255bab621549f340c86fe19005f1ebbc62 /src/opengl/gl2paintengineex/qtriangulatingstroker.cpp | |
| parent | 77f274672480e5980d9f42e4fd94c9770279543b (diff) | |
| parent | b6cf9e28c2fef9112789e98ac9d1eda45a407889 (diff) | |
| download | Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.zip Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.gz Qt-33441e2a611f07207b0b942368aab9010cdf8ab1.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/opengl/gl2paintengineex/qtriangulatingstroker.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulatingstroker.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp index c78f73f..6082f49 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp @@ -313,6 +313,7 @@ void QTriangulatingStroker::join(const qreal *pts) switch (m_join_style) { case Qt::BevelJoin: break; + case Qt::SvgMiterJoin: case Qt::MiterJoin: { // Find out on which side the join should be. int count = m_vertices.size(); |