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

config.tests

Update copyright year in Digia's license headers

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

dist

Add a changelog for the BC break

2013-01-29 12:43:33 +01:00

examples

Loop video infinetely on qmlvideofx.

2013-02-19 13:50:45 +01:00

src

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

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

tests

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

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

.gitattributes

Update the git-archive export options

2012-09-03 19:53:28 +02:00

.gitignore

Add qmake generated files to .gitignore.

2012-12-20 15:12:03 +01:00

.qmake.conf

centralize and fixup example sources install targets

2012-12-05 18:20:35 +01:00

.tag

Update the git-archive export options

2012-09-03 19:53:28 +02:00

qtmultimedia.pro

Don't run the Linux configure tests on OS X

2012-10-12 13:51:00 +02:00

sync.profile

point dependencies to 'release' branches

2012-12-18 11:56:18 +01:00

Description

No description provided

17 MiB

Languages

C++ 90.5%

Objective-C++ 5.8%

QMake 1%

Objective-C 0.9%

QML 0.5%

Other 1%