Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 21 Sep 2010 07:24:47 +0000 (09:24 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 21 Sep 2010 07:24:47 +0000 (09:24 +0200)
commit16ff3c87ad7b06991aa9d3a8bdc75805cd2e31b1
tree23467db05e49a5a03bd91f2c0bfc8a9a488a7337
parent660ec910ef60513b511e2292255e53701dbb239b
parent2836c2806e3bdfb6d29d99f74f1b15950fa39e35
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
src/opengl/qpaintengine_opengl.cpp