diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-08 08:09:09 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-08 08:10:57 (GMT) |
| commit | 3e299066d0270100331973ff202209c94cf362de (patch) | |
| tree | d00f7df9438d5c67058c85020b87b52e69678136 /src/declarative | |
| parent | 5d31f4a2175e69a7a56dea1d682c163dc8a1512c (diff) | |
| download | Qt-3e299066d0270100331973ff202209c94cf362de.zip Qt-3e299066d0270100331973ff202209c94cf362de.tar.gz Qt-3e299066d0270100331973ff202209c94cf362de.tar.bz2 | |
Fix crash on null object assignment
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativebinding.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp index 9a7a242..b397177 100644 --- a/src/declarative/qml/qdeclarativebinding.cpp +++ b/src/declarative/qml/qdeclarativebinding.cpp @@ -164,7 +164,8 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags) // 100% reliable, in many cases it gives us better error messages if we // assign this null-object to an incompatible property int type = ep->objectClass->objectType(scriptValue); - value = QVariant(type, (void *)0); + QObject *o = 0; + value = QVariant(type, (void *)&o); } } |