Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 4 Mar 2011 16:05:56 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 4 Mar 2011 16:05:56 +0000 (02:05 +1000)
commitca83e2df556e4e3db361ffd09696ef6c94d7324e
tree237edade3dc9e5fcdf623f9e7882805f0ea86c14
parent8ddf96a15f707001755d5b934f3f900b825b5887
parent57530dab8043c67b1356fb764fc83f6ef00dfdc1
Merge branch 4.7 into qt-master-from-4.7
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/gui/image/qpixmap_raster.cpp
src/gui/text/qtextcontrol.cpp