Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 1 Sep 2009 16:36:14 +0000 (18:36 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 1 Sep 2009 16:36:14 +0000 (18:36 +0200)
commite4804c5d3d2e80cc7f57936591374d29478dbb2a
tree76a85948ed5db925fda81028169e8dcde23b52b4
parentfc4c4071d6e5704e84a5cca4ae22548bedb7b19d
parentb2e91ecd641b9c891ea823cfc647f729af6228e8
Merge branch '4.5' into 4.6

Conflicts:
src/network/access/qnetworkaccessbackend.cpp
src/network/access/qnetworkreplyimpl.cpp
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
configure
src/network/access/qnetworkaccessbackend.cpp
src/network/access/qnetworkaccessmanager.cpp
src/network/access/qnetworkreplyimpl.cpp
src/network/access/qnetworkreplyimpl_p.h
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
tools/configure/configureapp.cpp