Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 15 Mar 2011 16:09:38 +0000 (17:09 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 15 Mar 2011 16:09:38 +0000 (17:09 +0100)
commite81c9e62f2052f2584d67827c88a0578fa2e3fab
treef6edb1a54e00e5ec8a7987338c25c5a351447c60
parentc0cd8db0498daaa8151d1f80143b6849016bdc7c
parent45c31fee7deea7800a2ef86dad7d6966ee2ceafd
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
src/gui/painting/qpainterpath.cpp
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/ssl/qsslsocket_openssl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qpainterpath/tst_qpainterpath.cpp