Merge branch '4.8-upstream' into master-water
authorWater-Team <water@pad.test.qt.nokia.com>
Sun, 18 Sep 2011 23:00:11 +0000 (01:00 +0200)
committerWater-Team <water@pad.test.qt.nokia.com>
Sun, 18 Sep 2011 23:00:11 +0000 (01:00 +0200)
commita27b646bff215301d9218c18d7eb330e1ed1e60a
tree96a4e29bdc733f39c9bd63a4474ee1ac319d46c5
parentc6b4e8e28456fe389e30c2038808681f86140950
parent53d9e3620ede7492c141402d9365d5c0dd7c10fd
Merge branch '4.8-upstream' into master-water
src/gui/graphicsview/qgraphicswidget.cpp