Merge commit 'origin/4.5' into 4.6
authorJoerg Bornemann <joerg.bornemann@nokia.com>
Tue, 6 Oct 2009 12:51:58 +0000 (14:51 +0200)
committerJoerg Bornemann <joerg.bornemann@nokia.com>
Tue, 6 Oct 2009 12:51:58 +0000 (14:51 +0200)
commit27456087b6c032b48b3aca6ea228a3d068a6d7c9
tree6b2ccb894f93e290adf245e51dbbe89978493ce1
parent6bbe0f3105fb8ec70aeb0952bec671b72b9f5400
parenta2b8c2b6b5c7de30a3b0d390c3d9885aabb98c57
Merge commit 'origin/4.5' into 4.6

Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
tests/auto/qgraphicsview/tst_qgraphicsview.cpp