1 files changed, 7 insertions, 0 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 3ba09f9cea..483d86c97d 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -551,6 +551,13 @@ QSGTextureProvider *QQuickImage::textureProvider() const
 {
     Q_D(const QQuickImage);
 
+    // When Item::layer::enabled == true, QQuickItem will be a texture
+    // provider. In this case we should prefer to return the layer rather
+    // than the image itself. The layer will include any children and any
+    // the image's wrap and fill mode.
+    if (QQuickItem::isTextureProvider())
+        return QQuickItem::textureProvider();
+
     if (!d->window || !d->sceneGraphRenderContext() || QThread::currentThread() != d->sceneGraphRenderContext()->thread()) {
         qWarning("QQuickImage::textureProvider: can only be queried on the rendering thread of an exposed window");
         return 0;