Merge "Merge remote-tracking branch 'origin/5.12.1' into 5.12" into refs/staging/5.12

6 files changed, 13 insertions, 9 deletions

diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 21a44a2fab..b1268097fc 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -52,10 +52,11 @@ exampledirs +=  ../../../examples/quick \
 
 imagedirs   += images
 
-
-#add particles sources
-headerdirs += ../../particles
-sourcedirs += ../../particles
+#add particles and shapes sources
+headerdirs += ../../particles \
+              ../../quickshapes
+sourcedirs += ../../particles \
+              ../../quickshapes
 
 #add imports directory because of dependencies
 headerdirs += ../../imports
diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp
index 82e5b1b05d..ae162bed87 100644
--- a/src/quick/handlers/qquicksinglepointhandler.cpp
+++ b/src/quick/handlers/qquicksinglepointhandler.cpp
@@ -108,7 +108,7 @@ bool QQuickSinglePointHandler::wantsPointerEvent(QQuickPointerEvent *event)
         int candidatePointCount = 0;
         int c = event->pointCount();
         QQuickEventPoint *chosen = nullptr;
-        for (int i = 0; i < c; ++i) {
+        for (int i = 0; i < c && !chosen; ++i) {
             QQuickEventPoint *p = event->point(i);
             if (!p->exclusiveGrabber() && wantsEventPoint(p)) {
                 if (!chosen)
diff --git a/src/quick/handlers/qquicksinglepointhandler_p.h b/src/quick/handlers/qquicksinglepointhandler_p.h
index b9e5b12224..7bf8eff999 100644
--- a/src/quick/handlers/qquicksinglepointhandler_p.h
+++ b/src/quick/handlers/qquicksinglepointhandler_p.h
@@ -82,7 +82,6 @@ protected:
 
     void setPointId(int id);
 
-private:
     void reset();
 
 private:
diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp
index d480d3b491..f24b2bfd7e 100644
--- a/src/quick/handlers/qquicktaphandler.cpp
+++ b/src/quick/handlers/qquicktaphandler.cpp
@@ -312,8 +312,12 @@ void QQuickTapHandler::setPressed(bool press, bool cancel, QQuickEventPoint *poi
             // on release, ungrab after emitting changed signals
             setExclusiveGrab(point, press);
         }
-        if (cancel)
+        if (cancel) {
             emit canceled(point);
+            setExclusiveGrab(point, false);
+            reset();
+            emit pointChanged();
+        }
     }
 }
 
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index e4e766a129..b840328184 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -600,7 +600,7 @@ void QQuickBorderImagePrivate::calculateRects(const QQuickScaleGrid *border,
         if (borderTop + borderBottom > sourceSize.height() && borderTop < sourceSize.height())
             borderBottom = sourceSize.height() - borderTop;
         *innerSourceRect = QRectF(QPointF(borderLeft / qreal(sourceSize.width()),
-                                          borderTop * devicePixelRatio / qreal(sourceSize.height())),
+                                          borderTop / qreal(sourceSize.height())),
                                   QPointF((sourceSize.width() - borderRight) / qreal(sourceSize.width()),
                                           (sourceSize.height() - borderBottom) / qreal(sourceSize.height()))),
         *innerTargetRect = QRectF(border->left(),
diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index 53b72d1e58..60d725d650 100644
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -2007,7 +2007,7 @@ void QQuickPathAngleArc::setCenterY(qreal centerY)
         return;
 
     _centerY = centerY;
-    emit centerXChanged();
+    emit centerYChanged();
     emit changed();
 }