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, 20 Jun 2010 11:15:52 +0000 (13:15 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Sun, 20 Jun 2010 11:15:52 +0000 (13:15 +0200)
commitf5bab2bc74ed03fd1db99cba3830b6b21795a627
treeb10c428a9b482354c5366e920a2a3359b676f82c
parent489cface92f40f4e82866b5fabf57d29e9632811
parenta27f18db247a0456ca15ad58f8dcc6b3441d55d0
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.

Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/text/qtextlayout.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidget/tst_qwidget.cpp