diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-01-13 04:40:31 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-01-18 10:47:59 (GMT) |
| commit | a71fdfc76a53d4db668e053f445f7ac4b9f91115 (patch) | |
| tree | 4044a3bf5b00f9b9844fc0dc915df6dc8623395c | |
| parent | 8ba8cbe7605e2ea75a0a30c11ffbab7f1ba93373 (diff) | |
| download | Qt-a71fdfc76a53d4db668e053f445f7ac4b9f91115.zip Qt-a71fdfc76a53d4db668e053f445f7ac4b9f91115.tar.gz Qt-a71fdfc76a53d4db668e053f445f7ac4b9f91115.tar.bz2 | |
Don't crash Qt Creator when debugging an object alias
Task-number: QTBUG-16131
(cherry picked from commit 3526db3b8832c357b368014e6c8ebab63d4071da)
| -rw-r--r-- | src/declarative/qml/qdeclarativeproperty.cpp | 2 |
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 |