Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Tue, 31 May 2011 15:33:12 +0000 (17:33 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Tue, 31 May 2011 15:33:12 +0000 (17:33 +0200)
commit73fc68802d8c0c8d3d499b279782ce270f1c5bc6
tree8cd7f54bc06864a741f0a2fd34412124c53e5953
parent9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc
parent570f8970bea646055583671397c3d2706ac45004
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
20 files changed:
examples/declarative/righttoleft/layoutdirection/layoutdirection.qml
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/gui/dialogs/dialogs.pri
src/gui/inputmethod/qcoefepinputcontext_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qsoftkeymanager_s60.cpp
src/gui/painting/qgraphicssystemex_symbian.cpp
src/gui/styles/styles.pri
src/network/socket/qhttpsocketengine.cpp
src/network/socket/qsocks5socketengine.cpp
src/plugins/phonon/mmf/mmf.pro
tests/auto/declarative/declarative.pro
tests/auto/qheaderview/tst_qheaderview.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/benchmarks/declarative/declarative.pro