Merge branch 'qtquick2' into v8
authorAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 10 Jun 2011 03:50:03 +0000 (13:50 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 10 Jun 2011 03:50:03 +0000 (13:50 +1000)
commitdc2b89dcb0022f9352932cf09ae716b4ac0dc043
treec6f1e352938294e5ff202abb92e3299e74475ec0
parentdb09dd7c820fb612658a08a1617758db277c5b55
parent77dfbea79094be6b763319fcca03f6b48ab8248e
Merge branch 'qtquick2' into v8
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgitem.h
src/declarative/qml/qdeclarativecompiler.cpp