Merge remote branch 'qt/4.7' into 4.7
authorJason McDonald <jason.mcdonald@nokia.com>
Thu, 18 Nov 2010 01:19:33 +0000 (11:19 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Thu, 18 Nov 2010 01:19:33 +0000 (11:19 +1000)
commit051793b7558ed16dfcb84f62ce3bd4a1545906a7
tree2496fdaec40857e9982c93d18107e09e233145d4
parent14ddf44ce2fdd7195741b9683226a3cd774e17e4
parentcca7c5b40751e2192ba2c7c7422557eeb5672a17
Merge remote branch 'qt/4.7' into 4.7

Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
src/network/ssl/qsslsocket_openssl.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf