Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

Conflicts:
	src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
	src/corelib/global/qglobal.h
	src/plugins/qpluginbase.pri
	src/qbase.pri
	tests/auto/selftests/expected_cmptest.txt
	tests/auto/selftests/expected_crashes_3.txt
	tests/auto/selftests/expected_longstring.txt
	tests/auto/selftests/expected_maxwarnings.txt
	tests/auto/selftests/expected_skip.txt
	tools/assistant/tools/assistant/doc/assistant.qdocconf
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf