summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-21 06:14:32 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-21 06:14:32 (GMT)
commit3e48bdc1562d1f067bf48422b34514a1e76a40a4 (patch)
tree757303cad645582fdff19f9f576930f88d842cc5 /src/declarative
parent6a61351ae264efb4df17794f97642f63dd0c3690 (diff)
parentccd9efbe06825f25eebefbfa72bc065d15d190ad (diff)
downloadQt-3e48bdc1562d1f067bf48422b34514a1e76a40a4.zip
Qt-3e48bdc1562d1f067bf48422b34514a1e76a40a4.tar.gz
Qt-3e48bdc1562d1f067bf48422b34514a1e76a40a4.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 969c60e..126d041 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -564,8 +564,10 @@ bool QDeclarativeMouseArea::sceneEvent(QEvent *event)
// state
d->pressed = false;
setKeepMouseGrab(false);
+ QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, false);
+ emit released(&me);
emit pressedChanged();
- //emit hoveredChanged();
+ setHovered(false);
}
}
return rv;