qt/qtmultimedia.git - Qt Multimedia

	Commit message (Collapse)	Author	Age	Files	Lines
*	GStreamer: Use member initialization	VaL Doroshchuk	2019-09-10	1	-34/+34
\| \| \| \| \| \|	Change-Id: I96026828c357677c84e880ea85e6e82b8c0495c7 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
*	Merge remote-tracking branch 'origin/5.12' into 5.13	Liang Qi	2019-06-03	1	-1/+2
\| \| \| \| \| \| \|	Conflicts: src/plugins/directshow/player/directshowplayerservice.cpp Change-Id: I6b7edc312ecfadf84653ce24321ec55da41e131a
*	Merge remote-tracking branch 'origin/5.12' into 5.13	Qt Forward Merge Bot	2019-02-02	1	-1/+2
\| \| \| \|	Change-Id: Ia13d887c3e3bf00b6ded5d052384fc5689b816fe
*	GstTools: move headers to correct folder	Jochen Seemann	2019-01-31	1	-0/+279
	We don't need to have the headers of QtMMGstTools in a separate directory of the QtMultimedia module. Change-Id: If304ab5ee5741aec7cf7785352f5a571bc4ec240 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>