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/kernel/qwidget_p.h
	src/gui/painting/qgraphicssystem_p.h
	src/plugins/plugins.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/QtOpenGLu.def
	src/s60installs/bwins/QtScriptu.def
	src/s60installs/bwins/QtSqlu.def
	src/s60installs/bwins/QtTestu.def
	src/s60installs/bwins/QtXmlPatternsu.def
	src/s60installs/bwins/phononu.def
	src/s60installs/eabi/QtGuiu.def
	src/s60installs/eabi/QtOpenGLu.def
	src/s60installs/eabi/QtTestu.def