Merge remote branch 'origin/4.8' into 4.8-from-4.7
authorRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 14 Sep 2011 07:45:44 +0000 (17:45 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Wed, 14 Sep 2011 07:45:44 +0000 (17:45 +1000)
commit1b30b3a6726adf806ae221357393e562285e8346
treec650ff836d3abdf5890726354ee6e2b9bce11304
parent1c1a5fe0e2d9e28be5e0e14732d79d34c9bb2a74
parent704dd92581783d91ccd234d58896d7078eed14a5
Merge remote branch 'origin/4.8' into 4.8-from-4.7

Conflicts:
src/gui/text/qtextengine_p.h
src/network/ssl/qsslsocket_openssl.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/network/access/qnetworkreplyimpl.cpp
src/plugins/bearer/corewlan/corewlan.pro
tools/qdoc3/cppcodemarker.cpp