3 files changed, 20 insertions, 1 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index f1f82f9e0e..ac0505da82 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -846,9 +846,24 @@ QTouchEvent *QQuickPointerTouchEvent::touchEventForItem(QQuickItem *item, bool i
         auto p = m_touchPoints.at(i);
         if (p->isAccepted())
             continue;
+        // include points where item is the grabber
         bool isGrabber = p->grabber() == item;
+        // include newly pressed points inside the bounds
         bool isPressInside = p->state() == QQuickEventPoint::Pressed && item->contains(item->mapFromScene(p->scenePos()));
-        if (!(isGrabber || isPressInside || isFiltering))
+
+        // filtering: (childMouseEventFilter) include points that are grabbed by children of the target item
+        bool grabberIsChild = false;
+        auto parent = p->grabber();
+        while (isFiltering && parent) {
+            if (parent == item) {
+                grabberIsChild = true;
+                break;
+            }
+            parent = parent->parentItem();
+        }
+        bool filterRelevant = isFiltering && grabberIsChild;
+
+        if (!(isGrabber || isPressInside || filterRelevant))
             continue;
 
         const QTouchEvent::TouchPoint *tp = touchPointById(p->pointId());
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index 03d96aea1f..e2a20f9e7e 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -385,6 +385,9 @@ QImage QQuickRenderControl::grab()
         cd->syncSceneGraph();
         render();
         grabContent = qt_gl_read_framebuffer(d->window->size() * d->window->effectiveDevicePixelRatio(), false, false);
+        if (QQuickRenderControl::renderWindowFor(d->window)) {
+            grabContent.setDevicePixelRatio(d->window->effectiveDevicePixelRatio());
+        }
 #endif
     } else if (d->window->rendererInterface()->graphicsApi() == QSGRendererInterface::Software) {
         QQuickWindowPrivate *cd = QQuickWindowPrivate::get(d->window);
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 924de3645b..d4195c7a05 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3521,6 +3521,7 @@ QImage QQuickWindow::grabWindow()
 
             bool alpha = format().alphaBufferSize() > 0 && color().alpha() < 255;
             QImage image = qt_gl_read_framebuffer(size() * effectiveDevicePixelRatio(), alpha, alpha);
+            image.setDevicePixelRatio(effectiveDevicePixelRatio());
             d->cleanupNodesOnShutdown();
             d->context->invalidate();
             context.doneCurrent();