Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8
authorAaron Kennedy <aaron.kennedy@nokia.com>
Wed, 22 Jun 2011 06:13:23 +0000 (16:13 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Wed, 22 Jun 2011 06:13:23 +0000 (16:13 +1000)
commit430ec8741e6c42a9f618b7d5246838bd50edd292
treee2e16199bb116d936a86da40b3466b406f8027f0
parentf60a61157cb361e19c50eb53391f18b82990a026
parent6938289ce3e1e29cc81f0e007390e0b5f6ef1a43
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into v8

Conflicts:
src/declarative/items/qsgcontext2d.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
src/declarative/items/qsgitem.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp