Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Jul 2011 16:06:20 +0000 (02:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 5 Jul 2011 16:06:20 +0000 (02:06 +1000)
commit013fb92b20db4fc3dc6a7a7d4cd0a3a0c941472f
treea010c01402ae8c9284e483da767a454489efb479
parentc018f01b8a97e9ae3dee12777fd1bde4c51f231e
parent6adc6f500e1d2f65a493a76baf35c5f11180edeb
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/dialogs/qmessagebox.cpp
src/gui/styles/qs60style.cpp
src/gui/styles/qs60style_p.h
src/gui/styles/qs60style_s60.cpp