Merge remote branch 'origin/4.6' into integration-master-from-4.6
authorRohan McGovern <rohan.mcgovern@nokia.com>
Thu, 18 Feb 2010 23:24:24 +0000 (09:24 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Thu, 18 Feb 2010 23:24:24 +0000 (09:24 +1000)
commit9fbbd3146c42869d56da8c82501be1e6a6595f36
tree092af029342fa1c5a59bc30c85d7257c88718609
parent4baa9dfb5273d7b501dcb3f456983262c53cc8d1
parent52e517b50aafd6cc0bec597abd50d8b3f7e982dd
Merge remote branch 'origin/4.6' into integration-master-from-4.6

Conflicts:
src/corelib/codecs/qtextcodec.h
14 files changed:
qmake/generators/symbian/symmake.cpp
src/corelib/codecs/qtextcodec.h
src/corelib/tools/qhash.h
src/corelib/tools/qlinkedlist.h
src/corelib/tools/qlist.h
src/corelib/tools/qmap.h
src/corelib/tools/qsharedpointer_impl.h
src/corelib/tools/qvector.h
src/gui/widgets/qcombobox.cpp
src/gui/widgets/qdockarealayout.cpp
src/gui/widgets/qmainwindow.cpp
src/gui/widgets/qmenu.cpp
src/network/access/qnetworkaccesshttpbackend.cpp
tests/auto/auto.pro