Merge branch 'master' into qtquick2
authorAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 05:31:31 +0000 (15:31 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 9 Jun 2011 05:31:31 +0000 (15:31 +1000)
commit2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b
tree5fce8dae2a55ee46f5e5e6f99bde376517f964f9
parent7cf421d04d19441a6e17ab9460dc4560374a5bcc
parent6a6242b30550b45180d74ddee82448cdf795eb21
Merge branch 'master' into qtquick2

Conflicts:
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgcanvasitem.cpp
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgcanvas_p.h
src/declarative/items/qsgcanvasitem.cpp