Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Sat, 12 Sep 2009 21:59:46 +0000 (23:59 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Sat, 12 Sep 2009 21:59:46 +0000 (23:59 +0200)
commitf129de853154dc1d72cb5651606ca009c3b1f814
tree8d500bcf8e6ef1f6a5f4ea0bc63f1810e6b167ff
parent1aa4cfab2d437210b8c0b064fa3bd071e53374c1
parent0293aff5c44202e5c62e229b74d8bd0bf9206185
Merge branch '4.5' into 4.6

Conflicts:
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
src/gui/kernel/qwidget_mac.mm
src/gui/painting/qprintengine_win.cpp
src/network/access/qnetworkreplyimpl.cpp
src/opengl/util/fragmentprograms_p.h
src/opengl/util/generator.cpp
tests/auto/qhostinfo/tst_qhostinfo.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
tests/auto/qsslcertificate/tst_qsslcertificate.cpp