Merge branch '4.5' into 4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Wed, 21 Oct 2009 20:07:26 +0000 (22:07 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Wed, 21 Oct 2009 20:07:26 +0000 (22:07 +0200)
commit26eda5fa33e401a1803b42e6eacf0921ddc6a14e
tree510cff78e0dcdd8a3b0d70dea9c270b37d8ac57d
parentfad27a3b6f018a0bc3cb261c81aaefc540589585
parent58574ea3590fbb28da5be73b983d83f0a8824d00
Merge branch '4.5' into 4.6

Conflicts:
src/gui/widgets/qmenu_mac.mm
tests/benchmarks/benchmarks.pro
tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/benchmarks/benchmarks.pro
tests/benchmarks/qnetworkreply/tst_qnetworkreply.cpp