Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 24 Mar 2011 16:18:52 +0000 (17:18 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 24 Mar 2011 16:18:52 +0000 (17:18 +0100)
commitf09b8e7b134c8dfe7e50d64662e943273d721d9a
tree19b13cbe46a5c676327c3b4098e527f465469523
parent295fbcba490712fe6e6f61926836920366134b55
parent660f881f04a0880c83a0b43b4f4d0e89da082d92
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
src/opengl/qwindowsurface_gl.cpp
src/gui/styles/qs60style.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
src/opengl/qwindowsurface_gl.cpp
src/plugins/plugins.pro