diff options
author | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-02-19 10:24:45 -0800 |
---|---|---|
committer | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-03-04 14:33:01 +0000 |
commit | 95ed69bd08f424b80524414fbc0456f315353cf5 (patch) | |
tree | cb6e334110b130529ff731addf1f0516a1332048 | |
parent | 638125ed783c89fdebba481ac071f8042328fa4b (diff) | |
download | qtwayland-95ed69bd08f424b80524414fbc0456f315353cf5.tar.gz |
QWaylandQuickItem: Fix Layeringv5.7.0-alpha1
If layering is enabled we should return the texture provider of the
base class into which any child items are drawn.
Change-Id: I13e6634860e8ccfec6511870f1b3cd36a5079225
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 7bf46a51..8fd759bd 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -252,6 +252,10 @@ QWaylandSurface::Origin QWaylandQuickItem::origin() const QSGTextureProvider *QWaylandQuickItem::textureProvider() const { Q_D(const QWaylandQuickItem); + + if (QQuickItem::isTextureProvider()) + return QQuickItem::textureProvider(); + return d->provider; } |