Liang Qi c1dbca5f10 Merge remote-tracking branch 'origin/5.5' into dev ...

Change-Id: Ic09d6310fcb6d8198b6ec2dc0459c1694e9df8c9

2015-03-17 16:40:28 +01:00

config.tests

Update copyright headers

2015-02-12 10:27:47 +00:00

dist

Added 5.4.1 change file.

2015-02-03 05:55:23 +00:00

examples

Improvide device selection in the video filter example

2015-03-16 13:00:43 +00:00

src

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-03-17 09:48:51 +01:00

tests

Improve QMediaPlayer auto tests.

2015-03-04 15:50:04 +00: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

Bump version

2015-02-24 16:23:09 +01:00

.tag

Update the git-archive export options

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

LGPL_EXCEPTION.txt

Update copyright headers

2015-02-12 10:27:47 +00:00

LICENSE.FDL

Add license files mandated by (L)GPL.

2013-02-23 02:36:26 +01:00

LICENSE.LGPLv3

Update copyright headers

2015-02-12 10:27:47 +00:00

LICENSE.LGPLv21

Update copyright headers

2015-02-12 10:27:47 +00:00

qtmultimedia.pro

Merge remote-tracking branch 'origin/5.4' into 5.5

2015-02-24 17:38:46 +01:00

sync.profile

Remove unnecessary dependency to qtjsbackend from sync.profile

2013-08-16 22:39:36 +02: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%