Merge branch 'qtquick2' into v8
authorAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 06:22:45 +0000 (16:22 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 06:22:45 +0000 (16:22 +1000)
commit250763ffb5cef2173b80b0e67266c937850ff516
tree1de5e73b20a714c2cd32565873e6f3712a699c0d
parent8bb487e60899382f0890fd675eb272d5cc562882
parent2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b
Merge branch 'qtquick2' into v8

Conflicts:
src/declarative/qml/qml.pri
src/declarative/declarative.pro
src/declarative/items/qsgcanvasitem.cpp
src/declarative/qml/qdeclarativecompiler.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeexpression.cpp
src/declarative/qml/qdeclarativeexpression.h
src/declarative/qml/qdeclarativevme.cpp
src/declarative/qml/qml.pri