summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-08 01:16:49 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-08 01:16:49 (GMT)
commit198377b456c494272e9a73a872478c5d5ae94af4 (patch)
tree274cd94ec07484342e8ece24a75d8512238a6f3b /src/declarative/graphicsitems
parent979ad950e257c0c90463ab6c2db7fea4aece3331 (diff)
downloadQt-198377b456c494272e9a73a872478c5d5ae94af4.zip
Qt-198377b456c494272e9a73a872478c5d5ae94af4.tar.gz
Qt-198377b456c494272e9a73a872478c5d5ae94af4.tar.bz2
Don't emit clicked() after pressAndHold()
Task-number: QTBUG-9676
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index c95bd29..a6cc75e 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -651,7 +651,7 @@ bool QDeclarativeMouseArea::setPressed(bool p)
emit positionChanged(&me);
} else {
emit released(&me);
- if (isclick)
+ if (isclick && !d->longPress)
emit clicked(&me);
}