Merge remote-tracking branch 'origin/4.8'
authorOlivier Goffart <olivier.goffart@nokia.com>
Wed, 18 May 2011 13:13:10 +0000 (15:13 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Wed, 18 May 2011 13:13:10 +0000 (15:13 +0200)
commit3b7b05ce8db881acfdcf193b3c8fb3d4919eb1c2
treeb35fb5f723752378dd4fede93a6c35c0aeb85ad2
parent1aeccd6bd14d7d9e098e333715f63e0225cd4a54
parent2c07b5d2cba8d8e499bd0861eefef12d4e00d99a
Merge remote-tracking branch 'origin/4.8'
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp