diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-04 01:04:39 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-04 01:04:39 (GMT) |
| commit | 89ce8d3b2a389a405f97d42bafa47ef244324822 (patch) | |
| tree | 4b2bb84bb51af405417ab6583267983b1bfcc0f0 /examples/script/context2d/context2d.cpp | |
| parent | 3d209a098d9abf5f8ffe9b64b27adbe622e84497 (diff) | |
| parent | f0844f9da7a834c282f6f04b2676f28de444e9dc (diff) | |
| download | Qt-89ce8d3b2a389a405f97d42bafa47ef244324822.zip Qt-89ce8d3b2a389a405f97d42bafa47ef244324822.tar.gz Qt-89ce8d3b2a389a405f97d42bafa47ef244324822.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxflickable.cpp
Diffstat (limited to 'examples/script/context2d/context2d.cpp')
| -rw-r--r-- | examples/script/context2d/context2d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/script/context2d/context2d.cpp b/examples/script/context2d/context2d.cpp index 5b4a1cf..05352cd 100644 --- a/examples/script/context2d/context2d.cpp +++ b/examples/script/context2d/context2d.cpp @@ -369,7 +369,7 @@ void Context2D::setLineCap(const QString &capString) style = Qt::RoundCap; else if (capString == "square") style = Qt::SquareCap; - else if (capString == "butt") + else //if (capString == "butt") style = Qt::FlatCap; m_state.lineCap = style; m_state.flags |= DirtyLineCap; @@ -397,7 +397,7 @@ void Context2D::setLineJoin(const QString &joinString) style = Qt::RoundJoin; else if (joinString == "bevel") style = Qt::BevelJoin; - else if (joinString == "miter") + else //if (joinString == "miter") style = Qt::MiterJoin; m_state.lineJoin = style; m_state.flags |= DirtyLineJoin; |