summaryrefslogtreecommitdiff
path: root/src/effects/private/qgfxsourceproxy.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-03-17 16:05:06 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2016-03-17 16:05:06 +0100
commit40bf1bb6f3db38eccb5937be43363c9f3afbf076 (patch)
tree48419f5ec38cd7ac35d50a9c17cfb2a0a5bf2124 /src/effects/private/qgfxsourceproxy.cpp
parent617b0385f34f0c515694c703ddf94395197859fb (diff)
parent4b8e9a348ca379b203c26ff14dd236267dd60646 (diff)
downloadqtgraphicaleffects-40bf1bb6f3db38eccb5937be43363c9f3afbf076.tar.gz
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I0014d3d7a0f7b8039021242033a4a7e3cb9dcb94
Diffstat (limited to 'src/effects/private/qgfxsourceproxy.cpp')
-rw-r--r--src/effects/private/qgfxsourceproxy.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/effects/private/qgfxsourceproxy.cpp b/src/effects/private/qgfxsourceproxy.cpp
index 9ec214e..6764407 100644
--- a/src/effects/private/qgfxsourceproxy.cpp
+++ b/src/effects/private/qgfxsourceproxy.cpp
@@ -102,6 +102,8 @@ void QGfxSourceProxy::useProxy()
QObject *QGfxSourceProxy::findLayer(QQuickItem *item)
{
+ if (!item)
+ return 0;
QQuickItemPrivate *d = QQuickItemPrivate::get(item);
if (d->extra.isAllocated() && d->extra->layer) {
QObject *layer = qvariant_cast<QObject *>(item->property("layer"));