Merge branch '4.7-review' into 4.7-staging
authorThierry Bastian <thierry.bastian@nokia.com>
Mon, 17 Jan 2011 15:58:27 +0000 (16:58 +0100)
committerThierry Bastian <thierry.bastian@nokia.com>
Mon, 17 Jan 2011 15:58:27 +0000 (16:58 +0100)
commit0cfda20a6dc0d1072cfb2c58e6d1ed7c9308ac14
tree096241106afeccb08b49fbf9d96f327ac71b8112
parentaf810e444ee73b112623128a3637b28b81f3f2fb
parent595fdf64402204bd983b2a7c5f888cc1982cd742
Merge branch '4.7-review' into 4.7-staging
src/corelib/kernel/qeventdispatcher_unix.cpp
src/gui/graphicsview/qgridlayoutengine.cpp
src/gui/styles/qs60style.cpp
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp