3 Commits

Author	SHA1	Message	Date
Frederik Gladhorn	d396262bc9	Merge remote-tracking branch 'origin/stable' into dev ... 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	2013-02-19 17:15:56 +01:00
Tobias Koenig	0ce2cb3ebe	Blackberry: Add support for reading meta data in QMediaPlayer ... Provide an implementation of QMetaDataReaderControl for the QMediaPlayer. Change-Id: I58c04e40ae3f07013450997410d0a379273c7bde Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>	2013-02-19 14:51:21 +01:00
Tobias Koenig	a0707d50cd	Blackberry: Refactor plugin directory structure ... Move the mediaplayer related code in its own subdirectory. This is a preparation for adding camera support in the future. Change-Id: I880ff90e154165c2a3a31fd2b51e1dd224fea8fd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>	2013-01-31 11:03:52 +01:00