Fix crash in lazy meta object generation.
authorAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 1 Jun 2012 14:07:54 +0000 (15:07 +0100)
committerQt by Nokia <qt-info@nokia.com>
Sun, 3 Jun 2012 23:34:31 +0000 (01:34 +0200)
commit469793778998aeaf46c99b7b8d049616bac4b689
tree875d753b306b6fb42cb42d2debc17c2c2d2aff75
parent12d432d1e39d62973ce3b35126b6bfa3b7f9cdbd
Fix crash in lazy meta object generation.

Inside the property cache, override data can only handle overrides
pointing to either a method or a property, but not to a signal
handler.  This is a bug in itself, but has never come up before due
to no one following override data on methods.  When this
was changed by d2e557c2c2d7fcf3bf7c1676df3902e115986dc2, this bug
was exposed.

This change doesn't actually fix the underlying problem, but it does
restore exactly the same behavior we had previously.  The complete
fix will come in a later change.

Change-Id: I6a890e6ca1e40735da8158b21dfe38dc88091081
Reviewed-by: Martin Jones <martin.jones@nokia.com>
src/qml/qml/qqmlpropertycache.cpp
tests/auto/qml/qqmlecmascript/data/overrideDataAssert.qml [new file with mode: 0644]
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp