Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

author Yoann Lopes <yoann.lopes@digia.com>

Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)

committer The Qt Project <gerrit-noreply@qt-project.org>

Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)
author Yoann Lopes <yoann.lopes@digia.com>
Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)
committer The Qt Project <gerrit-noreply@qt-project.org>
Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)
diff --cc src/plugins/gstreamer/camerabin/camerabinsession.h
Simple merge
diff --cc tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
Simple merge
author	Yoann Lopes <yoann.lopes@digia.com>
	Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)
committer	The Qt Project <gerrit-noreply@qt-project.org>
	Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)
		1	2
src/plugins/gstreamer/camerabin/camerabinsession.h	patch \|	diff1 \|	diff2 \|	blob \| history
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp	patch \|	diff1 \|	diff2 \|	blob \| history