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>
*	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 the spot for spot metering mode.	Michael Goddard	2012-01-06	1	-0/+12
\| \| \| \| \| \| \|	Not yet fully documented in QML - needs a bit of an overhaul first. Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
*	Update copyright year in license headers.	Jason McDonald	2012-01-06	1	-1/+1
\| \| \| \| \|	Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Multimedia: Compile on Windows.	Friedemann Kleint	2011-10-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	MSVC is more strict about #include <> and #include "". Reviewed-by: Ling Hu <ling.hu@nokia.com> Change-Id: I8973d7b2717d892407ad93785f92a64b05bdb6b5 Reviewed-on: http://codereview.qt-project.org/6134 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
*	QML Camera element redesign.	Dmytro Poplavskiy	2011-09-12	1	-0/+135
	Grouped camera properties in a similar way to C++ QCamera API. Added support for video recording. Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b Reviewed-on: http://codereview.qt-project.org/3552 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>