Merge branch 4.7 into qt-4.8-from-4.7
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 2 May 2011 16:05:08 +0000 (02:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 2 May 2011 16:05:08 +0000 (02:05 +1000)
commit20531a5d26113837cd48ecc52a70ae62fdd97606
treeeb46ee10d2481d2c3576e014e0fd03d8140e9437
parent8abaeb826c5fdb5bb872b27b3f411e63d63a12ff
parentc97917179c633fecd7c92180482ace941829ba49
Merge branch 4.7 into qt-4.8-from-4.7
src/opengl/qwindowsurface_gl.cpp
src/openvg/qwindowsurface_vg.cpp