projects
/
profile
/
ivi
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d19be66
)
Handle a null source item being provided to ShaderEffect
author
Martin Jones
<martin.jones@nokia.com>
Tue, 31 Jan 2012 03:52:01 +0000
(13:52 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 2 Feb 2012 01:35:56 +0000
(
02:35
+0100)
Change-Id: Ibb4a141349c85738f1710ecaadb8ab78a00372ae
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
src/quick/items/qquickshadereffect.cpp
patch
|
blob
|
history
diff --git
a/src/quick/items/qquickshadereffect.cpp
b/src/quick/items/qquickshadereffect.cpp
index
b30c9e9
..
d90d876
100644
(file)
--- 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]",