Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Wed, 15 Sep 2010 17:21:39 +0000 (19:21 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Wed, 15 Sep 2010 17:21:39 +0000 (19:21 +0200)
commitf23bce37a8a3536bfedce7cc2d57f0761b2d1e31
treee7dd9c7f7724df3f12fe819321e44c63f4eb0c2c
parentf41eac269d354ebeb797b9cb173b09fc996564cf
parentb832dffc1eb85181aa2d99afd1a6c764b634091d
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativemousearea.cpp
src/declarative/util/qdeclarativelistmodel.cpp