Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorGunnar Sletta <gunnar@trolltech.com>
Wed, 9 Sep 2009 08:47:04 +0000 (10:47 +0200)
committerGunnar Sletta <gunnar@trolltech.com>
Wed, 9 Sep 2009 08:47:04 +0000 (10:47 +0200)
commit6bdc4043f4d89da39cbbf67a5db4f0e308b632f1
treee4838e4e7c527b71c72706e85c8b3cc0eef322f8
parent67645790afd965e3fdf312d5233d7c2f0dc3619a
parentc363cd989a07056b0b8ea39e44c719512bb1e619
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/opengl/qpaintengine_opengl.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
src/opengl/qpaintengine_opengl.cpp