Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Fri, 1 Jul 2011 07:00:13 +0000 (09:00 +0200)
committerLiang Qi <liang.qi@nokia.com>
Fri, 1 Jul 2011 07:00:13 +0000 (09:00 +0200)
commit3dc0c38389670d6adddd972c532af98dd6b5deb5
tree779945938b51cc6290bc6dcee1cb34f696f42242
parent73f0d9534b593c65e4facf9a975e2c2e63608f03
parentf5feea56fc7202ab64a1b9c5f9b05391c2b88238
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60installs/s60installs.pro
src/declarative/graphicsitems/qdeclarativetextlayout.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/text/qstatictext.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp
src/s60installs/s60installs.pro
tests/auto/qstatictext/tst_qstatictext.cpp