Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Sun, 13 Jun 2010 16:12:33 +0000 (18:12 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Sun, 13 Jun 2010 16:12:33 +0000 (18:12 +0200)
commit89164d1e312ff44eb279cf18d7c4404499555d1b
tree3229272c1d8904e9e88b9a74d6b4f952871961d8
parent1c20abaaeef1ab448526e5821db06350537c1333
parent2f700c10f3c4287d2c60918e234e92f1524e84d1
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

src/3rdparty/webkit merged with checkout --ours

Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
src/gui/kernel/qt_s60_p.h
src/gui/text/qfontdatabase_s60.cpp
src/script/api/qscriptengine.cpp
src/corelib/tools/qtextboundaryfinder.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qt_s60_p.h
src/gui/text/qfontdatabase_s60.cpp
src/network/socket/qlocalserver_win.cpp