summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-01-13 04:40:31 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2011-01-13 04:40:31 (GMT)
commit3526db3b8832c357b368014e6c8ebab63d4071da (patch)
tree1521652d4c58903c766a788d3fb1c95e28a4e9d3
parent271c790e020b82be88e421611bef169334ea0a4f (diff)
downloadQt-3526db3b8832c357b368014e6c8ebab63d4071da.zip
Qt-3526db3b8832c357b368014e6c8ebab63d4071da.tar.gz
Qt-3526db3b8832c357b368014e6c8ebab63d4071da.tar.bz2
Don't crash Qt Creator when debugging an object alias
Task-number: QTBUG-16131
-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 e7dae98..8210314 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -665,7 +665,7 @@ QDeclarativePropertyPrivate::binding(QObject *object, int coreIndex, int valueTy
static_cast<const QDeclarativeVMEMetaObject *>(metaObjectForProperty(object->metaObject(), coreIndex));
QObject *aObject = 0; int aCoreIndex = -1; int aValueTypeIndex = -1;
- if (!vme->aliasTarget(coreIndex, &aObject, &aCoreIndex, &aValueTypeIndex))
+ if (!vme->aliasTarget(coreIndex, &aObject, &aCoreIndex, &aValueTypeIndex) || aCoreIndex == -1)
return 0;
// This will either be a value type sub-reference or an alias to a value-type sub-reference not both