Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Fri, 22 Jul 2011 08:38:28 +0000 (10:38 +0200)
committerLiang Qi <liang.qi@nokia.com>
Fri, 22 Jul 2011 08:38:28 +0000 (10:38 +0200)
commita0da99611734651f8ad4de3090f7ab05c2b2f9c1
treefe8b387b4de7757e97d2a27e2e1568470a3fca9f
parentb8327a0d5c5192750f7bf959290f6a50cdcb85b5
parent32763b898ad96cc0906aaf3406325134b849a284
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/image/qtiffhandler.cpp
src/gui/image/qtiffhandler.cpp
src/opengl/qpixmapdata_symbiangl.cpp