Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Wed, 17 Aug 2011 12:36:59 +0000 (14:36 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Wed, 17 Aug 2011 12:36:59 +0000 (14:36 +0200)
commit8cf2a609004344827518e2218be315f212738c36
tree176e8d33a616224c931caf6b437b5c876a00c7ad
parent9c2def85dc30eccea8e22e426a677ad869b59ad7
parent0940b13ba7eb7420588b968eb392825e88981308
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativetextinput.cpp