aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-10-07 14:14:27 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-07 07:07:33 +0200
commitfcfea59e30272ecabacb63c7dd4484fb9f04bc21 (patch)
tree9bf6245d02c916fe8f62439eb72887330eb5335b
parentcdf868033bbd7bf5a996c67fa56f8ac15e755115 (diff)
Fix possible crash with an empty handle
Change-Id: I729c919692c65c0ab4272368b7c98101ef573545 Reviewed-on: http://codereview.qt-project.org/6204 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
-rw-r--r--src/declarative/qml/qdeclarativeproperty.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 6e5e7122b9..78c37deff4 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -1297,7 +1297,7 @@ bool QDeclarativePropertyPrivate::writeBinding(const QDeclarativeProperty &that,
} \
- if (object && pp->valueType.valueTypeCoreIdx == -1) {
+ if (!isUndefined && object && pp->valueType.valueTypeCoreIdx == -1) {
switch (type) {
case QMetaType::Int:
if (result->IsInt32())