diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-01 23:00:12 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-01 23:00:12 (GMT) |
| commit | ed159636000cad0e13720edb973f514f8330227c (patch) | |
| tree | 52443941cf2d22daf6a6aad20388f7c901cb4916 /src/declarative | |
| parent | 6c796c75bfde7e79ec0802e0b7245283fc46d46e (diff) | |
| parent | 8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb (diff) | |
| download | Qt-ed159636000cad0e13720edb973f514f8330227c.zip Qt-ed159636000cad0e13720edb973f514f8330227c.tar.gz Qt-ed159636000cad0e13720edb973f514f8330227c.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativemousearea.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 1b7dce0..d9edd11 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -566,7 +566,8 @@ void QDeclarativeMouseArea::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *even if (!d->absorb) { QDeclarativeItem::mouseDoubleClickEvent(event); } else { - d->doubleClick = true; + if (d->isDoubleClickConnected()) + d->doubleClick = true; d->saveEvent(event); QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, true, false); me.setAccepted(d->isDoubleClickConnected()); diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 0c99ea8..6906f21 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -608,7 +608,7 @@ QDeclarativeContext *QDeclarativeEngine::rootContext() const QNetworkAccessManager with specialized caching, proxy and cookie support. - The factory must be set before exceuting the engine. + The factory must be set before executing the engine. */ void QDeclarativeEngine::setNetworkAccessManagerFactory(QDeclarativeNetworkAccessManagerFactory *factory) { |