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 Player example	VaL Doroshchuk	2017-09-28	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed memory leak. Renamed members, avoided passing args by copy. Changed the style of member initialization. Changed 0 to nullptr. Changed to new signal/slot style if possible. Removed Q_WS_SIMULATOR ifdef. Changed signal/slot connection style. Task-number: QTBUG-60627 Change-Id: I85bd6e56fe87f4e17f3c9964d6d1fdcb8202c519 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
*	Examples: Add missing override	Alexander Volkov	2016-12-12	1	-3/+3
\| \| \| \| \| \|	Change-Id: I54529fdc8013497edb98ee97863fe4a141bdbf1c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> 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/+59
	This follows suit with aeb036e in qtbase. Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>