Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
	src/gui/text/qfontengine_ft.cpp
	src/gui/text/qtextlayout.cpp
	src/plugins/phonon/mmf/mmf.pro
	src/plugins/s60/5_0/5_0.pro
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtDeclarativeu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/bwins/QtMultimediau.def
	src/s60installs/bwins/QtNetworku.def
	src/s60installs/bwins/QtScriptu.def
	src/s60installs/bwins/QtSqlu.def
	src/s60installs/bwins/QtTestu.def
	src/s60installs/bwins/QtXmlPatternsu.def
	src/s60installs/bwins/QtXmlu.def
	src/s60installs/bwins/phononu.def
	src/s60installs/s60installs.pro
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qtextlayout/tst_qtextlayout.cpp

Changes in qtextlayout.cpp and tst_qtextlayout.cpp and
qfontengine_ft.cpp are not merged because they will have
other fixes in 4.8