Fix up these QtWebKit files after the merge from 4.6.
authorSimon Hausmann <simon.hausmann@nokia.com>
Fri, 18 Sep 2009 14:43:27 +0000 (16:43 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Fri, 18 Sep 2009 14:43:27 +0000 (16:43 +0200)
commit8972f99ed6c9f97d059a0c9f8f642545286648e6
tree054a38ca2b40c62e45df523218497ca54af9a174
parentb68c5cd72b4fc58a1422a801e1c52c72be32f3d4
Fix up these QtWebKit files after the merge from 4.6.

I should've used checkout --theirs src/3rdparty/webkit after the merge,
instead of permitting git's auto-merge for these files.

Reviewed-by: Paul
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp