Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60
authoraxis <qt-info@nokia.com>
Fri, 19 Nov 2010 14:33:07 +0000 (15:33 +0100)
committeraxis <qt-info@nokia.com>
Fri, 19 Nov 2010 14:33:07 +0000 (15:33 +0100)
commit7eb9cf865f2b40ca3ca4bf8655b6bb6d40d6fcdd
tree322edf52459169ad0d5a93c765487b961968586e
parent4b380543cc973d575a3ed0c77918adbe5b6133f0
parentf234f248fa8f0d2bb74a14f5ee3cb489f256c0f2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60

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