Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 16:09:00 +0000 (02:09 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 13 May 2011 16:09:00 +0000 (02:09 +1000)
commitb9f9d811cfb71ab2983f25f3514da958e444de4b
tree40b0f8571a98ffa6377adb075256e300652343e7
parentb205fca78bcede0b2eefc8c0b12fed040e77eff1
parent3d27a19ca009836b812b59c3359db1369d391181
Merge branch 4.7 into qt-4.8-from-4.7
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/gui/text/qtextcontrol.cpp
src/gui/widgets/qmainwindow.cpp
src/gui/widgets/qmainwindowlayout.cpp
src/gui/widgets/qmainwindowlayout_p.h
src/gui/widgets/qmenu.cpp