summaryrefslogtreecommitdiff
path: root/src/effects/private/qgfxsourceproxy.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:04 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:04 +0200
commitd85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b (patch)
tree7557867d9fa040793880c715d6f81d1a50ea56c6 /src/effects/private/qgfxsourceproxy.cpp
parentf086de0f3a67698b8066576a423298aadf566e13 (diff)
parent6523d7c4843e1d4176035c46e1514c39bdcfc3bf (diff)
downloadqtgraphicaleffects-d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Iafd3a05a5a2a47252f5ee0724ec0362f8b841124
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 f917865..386cff8 100644
--- a/src/effects/private/qgfxsourceproxy.cpp
+++ b/src/effects/private/qgfxsourceproxy.cpp
@@ -108,6 +108,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"));