diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-10-22 12:05:18 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-10-22 12:26:28 +0200 |
| commit | aceb0d0cd2da89aebbf17729869b9e977290c826 (patch) | |
| tree | b29e815e32277710058bc32c571281937183fd43 /src/quick/handlers/qquickmultipointhandler.cpp | |
| parent | 6ecbe6441f825489b5fafde1a274952933254c7f (diff) | |
| parent | 1bb9c7b517e7995201d2a31cd1e852c02ad8c1bc (diff) | |
Merge remote-tracking branch 'origin/dev' into HEAD
Conflicts:
src/qml/compiler/qv4codegen.cpp
src/qml/compiler/qv4compileddata.cpp
src/qml/compiler/qv4compileddata_p.h
src/qml/compiler/qv4isel_moth_p.h
src/qml/compiler/qv4ssa.cpp
src/qml/jit/qv4assembler_p.h
src/qml/jit/qv4isel_masm_p.h
src/qml/jit/qv4regalloc.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4qmlcontext_p.h
src/qml/jsruntime/qv4regexp.cpp
src/qml/jsruntime/qv4regexp_p.h
src/qml/jsruntime/qv4regexpobject.cpp
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4vme_moth.cpp
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
tests/auto/qml/qml.pro
tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp
tools/qmlcachegen/qmlcachegen.cpp
Change-Id: I1577e195c736f3414089036b957a01cb91a3ca23
Diffstat (limited to 'src/quick/handlers/qquickmultipointhandler.cpp')
| -rw-r--r-- | src/quick/handlers/qquickmultipointhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp index 6cc7747e3a..41d8b228a1 100644 --- a/src/quick/handlers/qquickmultipointhandler.cpp +++ b/src/quick/handlers/qquickmultipointhandler.cpp @@ -80,7 +80,7 @@ QVector<QQuickEventPoint *> QQuickMultiPointHandler::eligiblePoints(QQuickPointe { QVector<QQuickEventPoint *> ret; int c = event->pointCount(); - QRectF targetBounds = target()->mapRectToScene(target()->boundingRect()) + QRectF parentBounds = parentItem()->mapRectToScene(parentItem()->boundingRect()) .marginsAdded(QMarginsF(m_pointDistanceThreshold, m_pointDistanceThreshold, m_pointDistanceThreshold, m_pointDistanceThreshold)); // If one or more points are newly pressed or released, all non-released points are candidates for this handler. // In other cases however, do not steal the grab: that is, if a point has a grabber, @@ -93,7 +93,7 @@ QVector<QQuickEventPoint *> QQuickMultiPointHandler::eligiblePoints(QQuickPointe if (exclusiveGrabber && exclusiveGrabber != this) continue; } - if (p->state() != QQuickEventPoint::Released && targetBounds.contains(p->scenePosition())) + if (p->state() != QQuickEventPoint::Released && parentBounds.contains(p->scenePosition())) ret << p; } return ret; |