Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 08:29:37 +0000 (10:29 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 08:29:37 +0000 (10:29 +0200)
commit27f566fb608d9465110dc67d16fe8f88ee9d4a0a
treec8925b7aa4effc946ba8330648c95a288f923d4d
parent79a093b7f4c78994504a0a9e306169df1eb4c7a3
parent144f3bade4d5f48ebc268dae0df26ddf7dfe1228
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
src/openvg/qpaintengine_vg.cpp
src/gui/styles/qstylesheetstyle.cpp
src/openvg/qpaintengine_vg.cpp