Merge branch 4.7 into qt-master-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 24 Feb 2011 16:05:32 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 24 Feb 2011 16:05:32 +0000 (02:05 +1000)
commit184398f4ada4b34fc9834c2341597a3b8c18e842
tree476b9b43b9cb12b0817d940c224dbb06a3c849f1
parent373d8a06c21fb3d237d1f2c7be604e1bcf7e42fa
parentd7cf3e40e491a92212ee57b88541d14bd79c4f4f
Merge branch 4.7 into qt-master-from-4.7
src/corelib/global/qglobal.h
src/gui/kernel/qapplication_s60.cpp
src/network/bearer/qnetworksession.h