qt/qtmultimedia.git - Qt Multimedia

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.9' into 5.10	Liang Qi	2017-10-27	1	-3/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf examples/multimedia/declarative-radio/view.qml src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
\| *	Fix outdated BSD license header	Kai Koehne	2017-10-18	1	-3/+13
\| \| \| \| \| \| \| \| \| \|	Change-Id: I386d30a54819bae016cb50cf5892a5ac380288f9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* \|	Modernize the Video Graphics Item example	VaL Doroshchuk	2017-09-28	1	-6/+5
\|/ \| \| \| \| \| \| \| \|	Changed initialization style, nullptr Cleanup. Task-number: QTBUG-60627 Change-Id: Ic6048274394fca4b0f595e96ace23bdd5096ddda Reviewed-by: Christian Stromme <christian.stromme@qt.io>
*	Merge remote-tracking branch 'origin/5.8' into dev	Yoann Lopes	2017-01-26	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .qmake.conf examples/multimediawidgets/videographicsitem/videoplayer.h src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp Change-Id: Id5ce05ffe2cd25657232157b162680b2e24a35ba
\| *	Examples: Add missing override	Alexander Volkov	2016-12-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I54529fdc8013497edb98ee97863fe4a141bdbf1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* \|	Polish the QtWidgets/videographicsitem example	Friedemann Kleint	2016-11-29	1	-1/+4
\|/ \| \| \| \| \| \| \| \| \| \| \|	Similar to 787211c1d2082874ea07be4c5987032221ee48fe: - Point the file dialog to the Movies folder. - Port to Qt 5 connection syntax. - Add command line handling. - Determine size according to screen size. Change-Id: I21b195a9241dbac332ce74168bd43f1d8c273091 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
*	Fix BSD license headers	Sergio Ahumada	2015-02-17	1	-3/+3
\| \| \| \| \| \|	Change-Id: I639ed933b789393fa50630af133e51abe3d7fae3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
*	Update copyright headers	Antti Kokko	2015-02-12	1	-5/+5
\| \| \| \| \| \| \| \| \|	Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
*	Update copyright year in Digia's license headers	Sergio Ahumada	2013-01-10	1	-1/+1
\| \| \| \| \| \|	Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
*	centralize and fixup example sources install targets	Joerg Bornemann	2012-12-05	1	-0/+83
	This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>