summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-05-11 03:15:41 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-05-11 03:15:41 (GMT)
commit5683a1b9dc6ce944ea250f05f92ccdec4c217410 (patch)
tree9ed8192b5b84c76a4b782cd3e08d7a83703294ed
parent8bb9edaeda5e14df3402c5990a0630a664048ac9 (diff)
parent9edfcd1ecd905ca27fbe9f241e37ab5fb204f89a (diff)
downloadQt-5683a1b9dc6ce944ea250f05f92ccdec4c217410.zip
Qt-5683a1b9dc6ce944ea250f05f92ccdec4c217410.tar.gz
Qt-5683a1b9dc6ce944ea250f05f92ccdec4c217410.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--src/declarative/canvas/qsimplecanvasitem.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/canvas/qsimplecanvasitem.cpp b/src/declarative/canvas/qsimplecanvasitem.cpp
index ba33a41..90ee688 100644
--- a/src/declarative/canvas/qsimplecanvasitem.cpp
+++ b/src/declarative/canvas/qsimplecanvasitem.cpp
@@ -1332,6 +1332,7 @@ QSimpleCanvasItem::~QSimpleCanvasItem()
parent()->remChild(this);
delete d->graphicsItem;
} else {
+ update();
setOptions(MouseFilter, false);
if (d->canvas){