1 files changed, 19 insertions, 3 deletions
diff --git a/src/quick/items/qquickpincharea.cpp b/src/quick/items/qquickpincharea.cpp
index 0692a1da42..df6f271b0d 100644
--- a/src/quick/items/qquickpincharea.cpp
+++ b/src/quick/items/qquickpincharea.cpp
@@ -556,7 +556,10 @@ void QQuickPinchArea::updatePinch()
                         d->inPinch = true;
                         d->stealMouse = true;
                         if (d->pinch && d->pinch->target()) {
-                            d->pinchStartPos = pinch()->target()->position();
+                            auto targetParent = pinch()->target()->parentItem();
+                            d->pinchStartPos = targetParent ?
+                                        targetParent->mapToScene(pinch()->target()->position()) :
+                                        pinch()->target()->position();
                             d->pinchStartScale = d->pinch->target()->scale();
                             d->pinchStartRotation = d->pinch->target()->rotation();
                             d->pinch->setActive(true);
@@ -604,6 +607,9 @@ void QQuickPinchArea::updatePinchTarget()
         s = qMin(qMax(pinch()->minimumScale(),s), pinch()->maximumScale());
         pinch()->target()->setScale(s);
         QPointF pos = d->sceneLastCenter - d->sceneStartCenter + d->pinchStartPos;
+        if (auto targetParent = pinch()->target()->parentItem())
+            pos = targetParent->mapFromScene(pos);
+
         if (pinch()->axis() & QQuickPinch::XAxis) {
             qreal x = pos.x();
             if (x < pinch()->xmin())
@@ -704,6 +710,8 @@ bool QQuickPinchArea::event(QEvent *event)
             clearPinch();
             break;
         case Qt::ZoomNativeGesture: {
+            if (d->pinchRejected)
+                break;
             qreal scale = d->pinchLastScale * (1.0 + gesture->value());
             QQuickPinchEvent pe(d->pinchStartCenter, scale, d->pinchLastAngle, 0.0);
             pe.setStartCenter(d->pinchStartCenter);
@@ -721,7 +729,10 @@ bool QQuickPinchArea::event(QEvent *event)
             else
                 emit pinchStarted(&pe);
             d->inPinch = true;
-            updatePinchTarget();
+            if (pe.accepted())
+                updatePinchTarget();
+            else
+                d->pinchRejected = true;
         } break;
         case Qt::SmartZoomNativeGesture: {
             if (gesture->value() > 0.0 && d->pinch && d->pinch->target()) {
@@ -745,6 +756,8 @@ bool QQuickPinchArea::event(QEvent *event)
             emit smartZoom(&pe);
         } break;
         case Qt::RotateNativeGesture: {
+            if (d->pinchRejected)
+                break;
             qreal angle = d->pinchLastAngle + gesture->value();
             QQuickPinchEvent pe(d->pinchStartCenter, d->pinchLastScale, angle, 0.0);
             pe.setStartCenter(d->pinchStartCenter);
@@ -763,7 +776,10 @@ bool QQuickPinchArea::event(QEvent *event)
                 emit pinchStarted(&pe);
             d->inPinch = true;
             d->pinchRotation = angle;
-            updatePinchTarget();
+            if (pe.accepted())
+                updatePinchTarget();
+            else
+                d->pinchRejected = true;
         } break;
         default:
             return QQuickItem::event(event);