Merge remote-tracking branch 'origin/5.3' into 5.4

author Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

Tue, 14 Oct 2014 12:05:02 +0000 (14:05 +0200)

committer Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>

Tue, 14 Oct 2014 12:05:02 +0000 (14:05 +0200)
author Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 12:05:02 +0000 (14:05 +0200)
committer Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 14 Oct 2014 12:05:02 +0000 (14:05 +0200)
diff --cc src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp
Simple merge
diff --cc src/plugins/wmf/player/mfplayersession.cpp
Simple merge
author	Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
	Tue, 14 Oct 2014 12:05:02 +0000 (14:05 +0200)
committer	Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
	Tue, 14 Oct 2014 12:05:02 +0000 (14:05 +0200)
		1	2
src/plugins/qnx/mediaplayer/mmrendererplayervideorenderercontrol.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/plugins/wmf/player/mfplayersession.cpp	patch \|	diff1 \|	diff2 \|	blob \| history