Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Thu, 14 Jul 2011 09:15:55 +0000 (11:15 +0200)
committerLiang Qi <liang.qi@nokia.com>
Thu, 14 Jul 2011 09:15:55 +0000 (11:15 +0200)
commit88d6bf04e01f4f006ed2708851e925d59012d591
tree0fbd062191d966b7d2d1cc59dcafb9631e02b71f
parent80b91ac5f579b5cc310366fb0ea4aa4c813c04bf
parent6827ea5e97c9f6540f0fae5236f89343c32f4cb8
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
doc/src/deployment/deployment.qdoc
doc/src/external-resources.qdoc
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp