qt/qtmultimedia.git - Qt Multimedia

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Update commercial license headers"v5.15.3-lts-lgpl	Tarja Sundqvist	2021-03-25	1	-21/+21
\| \| \| \| \| \| \| \| \| \| \|	This reverts commit 80d46e3a5f64ff2456c40bdba63b6d5c69a32cdd. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I5c64ffa120f916711e5cf01c828774f8456dec06 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
*	Update commercial license headers	Tarja Sundqvist	2021-01-27	1	-21/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated header.COMM to files in tqtc-qtmultimedia. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reaso for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4171 Change-Id: I86ebf7c3653b55983cefff246c0cb019cbcda8c4 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
*	Merge remote-tracking branch 'origin/5.12' into 5.13	Liang Qi	2019-07-23	1	-0/+4
\| \| \| \| \| \| \|	Conflicts: src/plugins/directshow/player/directshowplayerservice.cpp Change-Id: I482098bb3c3b5b291175ca798b0d6ba61ad87d86
*	GstTools: move headers to correct folder	Jochen Seemann	2019-01-31	1	-0/+92
	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>