Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Jul 2011 16:06:16 +0000 (02:06 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 7 Jul 2011 16:06:16 +0000 (02:06 +1000)
commit4f8978312a8897e27b2e548fe85f2a76402aa17a
tree47bbd865ea2d4603b271f01a8c9f1aac1c19e9c1
parent8bc5a6319455d7dc0655a8c48862ada8890b0064
parent1fc2dcd798cf984d59568c1f681c830ce16bda1e
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/dialogs/qmessagebox.cpp
src/gui/painting/qpainter.cpp