qt/qtmultimedia.git - Qt Multimedia

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.6' into 5.7	Liang Qi	2016-03-07	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/plugins/avfoundation/mediaplayer/mediaplayer.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro Change-Id: I5742596230dc510ba2a09eba624429bb67179194
\| *	remove redundant statements from project files	Oswald Buddenhagen	2016-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- TARGET is unnecessary if it matches the project file's basename - CONFIG+=no_private_qt_headers_warning is added by qt_build_config.prf - load(qt_build_config) is done by .qmake.conf Change-Id: I3eb45a758dfee34be3c78fc13d996780741c95e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* \|	Updated license headers	Antti Kokko	2016-01-20	1	-17/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I96559337481456cce6ea909fb7e53877acd352bd Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* \|	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests.	Friedemann Kleint	2015-08-24	1	-1/+0
\|/ \| \| \| \| \| \| \| \|	There was only one test actually using the deprecated WaitForWindowShown(). Replace by qWaitForWindowExposed() and remove define. Change-Id: I2e71edca8f8be26c9a63b6a9d1fa30b31979c1fe Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
*	Update copyright headers	Antti Kokko	2015-02-12	1	-7/+7
\| \| \| \| \| \| \| \| \|	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 license headers and add new license files	Antti Kokko	2014-08-24	1	-19/+11
\| \| \| \| \| \| \| \| \|	- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.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>
*	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>
*	Set the Qt API level to compatibility mode in all tests.	Thiago Macieira	2012-08-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I9589f57998af237f2e89c7799789dae5a13ef634 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	QSampleCache unit test: correctly check whether sample is cached.	Lev Zelenskiy	2012-04-27	4	-24/+41
\| \| \| \| \| \| \| \|	Use QSample::isCached instead of relying on pointers. Also added a test for loading an invalid file. Change-Id: I9f4f1e8c3dc3cdb4a88a756cc6cad85e68c3a1b6 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
*	Added unit test for QSampleCache.	Lev Zelenskiy	2012-04-25	4	-0/+190
	Change-Id: I4dbd54822f246ba9a69ab85897a4c983b7c17561 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>