Merge branch '4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Fri, 9 Apr 2010 12:24:58 +0000 (14:24 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Fri, 9 Apr 2010 12:24:58 +0000 (14:24 +0200)
commit7beb00f80967380b4d94af3f19af3f594ea40d1b
tree2e20f9830d21eb618da6b011a69132e55d0f71c0
parent850c3f7d9bb5fbad041dd935d1d53c5d49db0163
parent11aebece9ecc3214dd7a8006d980e90dcbddb577
Merge branch '4.6' into qt-4.7-from-4.6
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp