aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2012-01-31 13:52:01 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-02 02:35:56 +0100
commitc30a170bb0777e5d5ddc2d45a3ca98d3af0c62c4 (patch)
tree5d753be61dc086ec9299740f9cc4c9bcc9689ba0 /src/quick
parentd19be6639999970105820d690952fee5b8e874ec (diff)
Handle a null source item being provided to ShaderEffect
Change-Id: Ibb4a141349c85738f1710ecaadb8ab78a00372ae Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/items/qquickshadereffect.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index b30c9e93d8..d90d8761c8 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -413,6 +413,8 @@ void QQuickShaderEffect::setSource(const QVariant &var, int index)
}
QObject *obj = qVariantValue<QObject *>(var);
+ if (!obj)
+ return;
QQuickItem *item = qobject_cast<QQuickItem *>(obj);
if (!item || !item->isTextureProvider()) {
qWarning("ShaderEffect: source uniform [%s] is not assigned a valid texture provider: %s [%s]",