Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorBea Lam <bea.lam@nokia.com>
Thu, 25 Feb 2010 23:35:43 +0000 (09:35 +1000)
committerBea Lam <bea.lam@nokia.com>
Thu, 25 Feb 2010 23:35:43 +0000 (09:35 +1000)
commit31c8459d65aaca9131a8aa32e29e0591ed7892cb
tree5339f4b4291c17a9a765a70990ec3c12f4055de7
parent5c82031a7357f4f3d100be30c0bfe4e878712829
parent61811d9b43828c1cc53c773fd66b78313f4fb942
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
src/declarative/qml/qdeclarativecompiler.cpp
src/declarative/qml/qdeclarativeproperty.cpp
tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp