Merge commit 'origin/4.5' into origin/4.6
authorOlivier Goffart <ogoffart@trolltech.com>
Thu, 15 Oct 2009 13:24:16 +0000 (15:24 +0200)
committerOlivier Goffart <ogoffart@trolltech.com>
Thu, 15 Oct 2009 13:24:16 +0000 (15:24 +0200)
commitb61d07fc4ad33193d67ac771e7266b43ea6a859b
treef06f39d2668f8ebf926de252d30f60d119d6b4ed
parent0417dd8dacb8b6123df10c947af396bed1ade82f
parent2eb373a68367a6511e12d60034e920345431bcc8
Merge commit 'origin/4.5' into origin/4.6

Conflicts:
src/gui/kernel/qcocoaview_mac.mm
src/network/access/qhttpnetworkconnection.cpp
src/opengl/qgl_qws.cpp
src/opengl/qglpixelbuffer_egl.cpp
src/gui/itemviews/qabstractitemview.cpp
src/gui/kernel/qcocoaview_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qtreewidget/tst_qtreewidget.cpp