diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-06-23 06:52:34 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-06-23 06:52:34 (GMT) |
| commit | 944c753e15df02605ca415f4463dec3e25b8711b (patch) | |
| tree | 4a6a7b3d05e55d208ba60a77dbb32b92779f3274 | |
| parent | faebec95f12f2db4cc105738c064e12bd0bcf988 (diff) | |
| parent | b1c128415894686d61b3d568e5117ba96dd4c74e (diff) | |
| download | Qt-944c753e15df02605ca415f4463dec3e25b8711b.zip Qt-944c753e15df02605ca415f4463dec3e25b8711b.tar.gz Qt-944c753e15df02605ca415f4463dec3e25b8711b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | doc/src/images/qml-xmlhttprequest-example.png | bin | 21311 -> 20934 bytes | |||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativerectangle.cpp | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/images/qml-xmlhttprequest-example.png b/doc/src/images/qml-xmlhttprequest-example.png Binary files differindex 68e7d27..f585613 100644 --- a/doc/src/images/qml-xmlhttprequest-example.png +++ b/doc/src/images/qml-xmlhttprequest-example.png diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp index 2756877..c49be46 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp +++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp @@ -446,6 +446,7 @@ void QDeclarativeRectangle::drawRect(QPainter &p) p.setRenderHint(QPainter::Antialiasing); if (d->pen && d->pen->isValid()) { QPen pn(QColor(d->pen->color()), d->pen->width()); + pn.setJoinStyle(Qt::MiterJoin); p.setPen(pn); } else { p.setPen(Qt::NoPen); |
