Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 08:21:47 +0000 (10:21 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 08:21:47 +0000 (10:21 +0200)
commit16f58282bc5a1f81f7346ac6560df68761ad277d
tree38cc24d17ea4d868ee3cffd8ca99e96ac08e76dd
parent280242a5a14a99cc10857e35da61ac5b894d5f6b
parent1b7c1b6ef86d3d56ff01b2eab118062a229b0d19
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
src/declarative/items/qsgflickable.cpp
src/declarative/items/qsgflickable_p_p.h
src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp