Merge branch 'master' into v8-clean
authorAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 1 Jul 2011 01:30:00 +0000 (11:30 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 1 Jul 2011 01:30:00 +0000 (11:30 +1000)
commitd09d7aec4c3f4db0c4d6a09c33aff863551a8369
treec6252697e54e186f075e9ae7b3d55fb10382648a
parente2c67953cea0ba8ceec880d124c9e9c97ec55207
parent3296449d5cd9491b56914a23a78d2f78982a6856
Merge branch 'master' into v8-clean

Conflicts:
src/declarative/qml/qdeclarativevme.cpp

Change-Id: I0bbc12c06d40c70433730cb33c4e9b461520263f
src/declarative/items/qsgitem.cpp
src/declarative/qml/qdeclarativeinstruction_p.h
src/declarative/qml/qdeclarativevme.cpp
tests/auto/declarative/nodes/tst_nodestest.cpp
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp