summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-06-23 06:52:34 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-06-23 06:52:34 (GMT)
commit944c753e15df02605ca415f4463dec3e25b8711b (patch)
tree4a6a7b3d05e55d208ba60a77dbb32b92779f3274 /src
parentfaebec95f12f2db4cc105738c064e12bd0bcf988 (diff)
parentb1c128415894686d61b3d568e5117ba96dd4c74e (diff)
downloadQt-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
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle.cpp1
1 files changed, 1 insertions, 0 deletions
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);