Merge remote branch 'qt-qml-review/master' into master-qml-staging
authorKai Koehne <kai.koehne@nokia.com>
Mon, 23 May 2011 08:49:19 +0000 (10:49 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Mon, 23 May 2011 08:49:19 +0000 (10:49 +0200)
commit565bd12bdc7b73e4222de44699df9904a1cfcd81
treef3cb3986a375cb25962dbfe48a065804fc53b686
parent21711d7ad54b0ee83e776ac3ad83121221fdf24b
parentf1efb2e8866203cbf95d288ea0ccb1992413c3fc
Merge remote branch 'qt-qml-review/master' into master-qml-staging
src/declarative/qml/qdeclarativeproperty.cpp
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp