Merge remote branch 'qt/4.7' into 4.7
authorJason McDonald <jason.mcdonald@nokia.com>
Tue, 23 Nov 2010 04:05:23 +0000 (14:05 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Tue, 23 Nov 2010 04:05:23 +0000 (14:05 +1000)
commit1ba013feae994a40abe3835185cae211b136a0e8
tree98655d7af549f1b9099374ed86bdfac49719e449
parentd7d0b1528fd200fc3110093244b8265fdf457238
parentb1c412cefa51f0eea79dbf279f2a23414ccecc3d
Merge remote branch 'qt/4.7' into 4.7

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