Fix crash when a model defines its own modelData role.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Thu, 28 Jul 2011 01:17:21 +0000 (11:17 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 28 Jul 2011 02:34:31 +0000 (04:34 +0200)
commit0e008e9a8fc32d84c03e88a4a41ec8801b274979
tree1ffe6e0cdba0f0061b3f13b026517c458999bf6d
parent44e201c04e699f3bee49f63894477f5105092cb0
Fix crash when a model defines its own modelData role.

Don't create a duplicate modelData property if one has already been
created from the model's roles.

Task-number: QTBUG-18801
Change-Id: Ic46763a9dc067cfb53b0655d991c553b3b10f023
Reviewed-on: http://codereview.qt.nokia.com/2312
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
src/declarative/items/qsgvisualitemmodel.cpp
tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp