Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 9 Mar 2011 16:04:21 +0000 (02:04 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 9 Mar 2011 16:04:21 +0000 (02:04 +1000)
commitbb7b62f3cb7aca178a9e5e65263d0a4a8d40829c
tree063b724a9b17c814c49b2ead876d795e0f559db7
parent1e9b107b082282d4aadcffedcd67cb7e5e56aef8
parentdc6b5702e0c488bf51ca029290eb65604bfb1dd5
Merge branch 4.7 into qt-master-from-4.7
src/gui/image/qpixmap.cpp
src/gui/text/qtextcontrol.cpp