Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Fri, 29 Jul 2011 15:43:07 +0000 (17:43 +0200)
committerLiang Qi <liang.qi@nokia.com>
Fri, 29 Jul 2011 15:43:07 +0000 (17:43 +0200)
commit29a5089b83b1b43ecf2c746dac8cadbbe4385553
tree69a3f39667e0ff22a3d7507fafcdb7c9cd219daf
parentc9f0c578bbaf73211ad4729e1496e53867a641c9
parent174e01a16aba71cfaa7b095be6430f8e4a89d0b8
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/text/qfont_s60.cpp
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/text/qfont_s60.cpp
src/gui/text/qfontdatabase_s60.cpp
src/gui/text/qtextengine.cpp
src/gui/text/qtextlayout.cpp