Frederik Gladhorn 47698fc57f Merge remote-tracking branch 'origin/5.4' into dev ...

Conflicts:
	.qmake.conf

Change-Id: I31e377cdccf8bf5c1ea8143faf2001ac99608c27

2014-12-17 16:53:41 +01:00

config.tests

GStreamer: port to 1.0.

2014-11-27 23:30:05 +01:00

dist

Added 5.4.0 change file.

2014-12-03 20:27:39 +01:00

examples

GStreamer: port to 1.0.

2014-11-27 23:30:05 +01:00

src

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

2014-12-17 16:53:41 +01:00

tests

Allow supported camera locks to change after initialization.

2014-11-28 04:19:35 +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

Bump version

2014-12-12 13:48:26 +01:00

.tag

Update the git-archive export options

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

LGPL_EXCEPTION.txt

Add license files mandated by (L)GPL.

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

LICENSE.FDL

Add license files mandated by (L)GPL.

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

LICENSE.GPLv2

Update license headers and add new license files

2014-08-24 17:30:13 +02:00

LICENSE.LGPLv3

Update license headers and add new license files

2014-08-24 17:30:13 +02:00

LICENSE.LGPLv21

Update license headers and add new license files

2014-08-24 17:30:13 +02:00

qtmultimedia.pro

GStreamer: port to 1.0.

2014-11-27 23:30:05 +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%