Merge remote branch 'origin/4.6' into 4.7-from-4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Thu, 29 Jul 2010 07:46:48 +0000 (17:46 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Thu, 29 Jul 2010 07:46:48 +0000 (17:46 +1000)
commit940b5b23268193d58d7e229bf97a22276098790b
treeaf532e70e2646012b6a856bab48a105389bc2098
parentd1e1f49ea0b742fd655112fdb30f5751e142a766
parent0041606aefae5da0ff6c8187540f3eff33cbb643
Merge remote branch 'origin/4.6' into 4.7-from-4.6

Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
src/gui/itemviews/qlistview.cpp
src/gui/text/qfontengine_s60.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro