Merge branch 'qt-graphics-team-text-master'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 10 Jan 2011 13:11:30 +0000 (14:11 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Mon, 10 Jan 2011 13:11:30 +0000 (14:11 +0100)
commit3263f8036128cc4403cf6383324f5390eecee13b
tree227ea1dfe86b9297cf7808b5b304a039c438e1fe
parent4d53a691aaac9789ddd4f9d4e968d28ace2181ca
parent0faab4442040fdfe3790e3c02808fd45993f0265
Merge branch 'qt-graphics-team-text-master'
src/gui/painting/qpaintengine_raster.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp