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

..

auto

Merge remote-tracking branch 'origin/stable' into dev

2013-02-19 17:15:56 +01:00

global

tst_bic: Add linux-gcc-ia32 bic data for QtMultimediaWidgets

2013-01-15 13:45:49 +01:00

systemtests

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

tests.pro

Initial copy of QtMultimediaKit.

2011-06-29 13:38:46 +10:00