Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
authorDavid Boddie <dboddie@trolltech.com>
Fri, 18 Jun 2010 15:38:40 +0000 (17:38 +0200)
committerDavid Boddie <dboddie@trolltech.com>
Fri, 18 Jun 2010 15:38:40 +0000 (17:38 +0200)
commitfc0e74d5661da0a678a60082dae60d4564da94b0
tree512256a8bfc49ed4a17a821b8e683662b65e6ddc
parente5302035d91f4337db25cf805c6b13339c552cbf
parentb82466a64e305af8c557b2b7fdbb4a386e3d9cd7
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
src/gui/graphicsview/qgraphicsitem.cpp