Merge branch '4.7' into 4.7-s60
authoraxis <qt-info@nokia.com>
Tue, 23 Nov 2010 08:51:55 +0000 (09:51 +0100)
committeraxis <qt-info@nokia.com>
Tue, 23 Nov 2010 08:51:55 +0000 (09:51 +0100)
commit879c325b3ea8108790f46f3bb58e91ebc12fa550
tree97463065a200e32bb80b19781fddc088cb81d025
parentd7d0b1528fd200fc3110093244b8265fdf457238
parentb1c412cefa51f0eea79dbf279f2a23414ccecc3d
Merge branch '4.7' into 4.7-s60

Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp