qt/qtmultimedia.git - Qt Multimedia

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/stable' into dev	Frederik Gladhorn	2013-02-19	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
\| *	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>
* \|	Remove QT_{BEGIN,END}_HEADER macro usage	Sergio Ahumada	2013-01-28	1	-4/+0
\|/ \| \| \| \| \| \| \| \|	The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
*	Change copyrights from Nokia to Digia	Iikka Eklund	2012-09-24	1	-24/+24
\| \| \| \| \| \| \| \| \|	Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
*	Updated declarative components to use the QML module	Jonas Rabbe	2012-03-14	1	-2/+2
\| \| \| \| \|	Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
*	Remove "All rights reserved" line from license headers.	Jason McDonald	2012-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Update obsolete contact address.	Jason McDonald	2012-01-23	1	-1/+1
\| \| \| \| \| \| \|	Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Add a simple Torch class that wraps the camera flash.	Michael Goddard	2012-01-19	1	-0/+93
	Since nearly all programmable torch hardware doubles as camera flash hardware, offer this class here that wraps the QCameraFlashControl. Change-Id: Ib2c061c21c14221d67477d8a3fd89a76fc26ed71 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>