Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Tue, 16 Aug 2011 06:00:17 +0000 (08:00 +0200)
committerLiang Qi <liang.qi@nokia.com>
Tue, 16 Aug 2011 06:00:17 +0000 (08:00 +0200)
commit1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1
tree65b658582151aa9b47a6b9843463dddd032a8323
parentab90235dfa1874e5c70875ed9b68817e698a55b3
parent35665053a56f7c74e45d65234630a130ba24a27a
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/kernel/qwidget_s60.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qtextdocument_p.cpp
tests/auto/qtextcursor/tst_qtextcursor.cpp