Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 14 May 2011 16:05:55 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 14 May 2011 16:05:55 +0000 (02:05 +1000)
commit9f1bf75b1d55af2dda000cba580fafed2aa83838
tree5ba2221956374ce3669bd6df52c29cb262cb66ae
parente9e95f75e7c1e8325c2acce0087ff8677d773779
parent61e7b85a146778ce5907000733f246e4ebdce26a
Merge branch 4.7 into qt-4.8-from-4.7
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qt_s60_p.h