Yoann Lopes af2d5a181c Merge remote-tracking branch 'origin/5.4' into dev ...

Conflicts:
	.qmake.conf
	src/plugins/gstreamer/camerabin/camerabinsession.cpp

Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26

2015-01-19 14:45:09 +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

Fix some typos in strings.

2014-12-25 15:10:37 +01:00

src

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

2015-01-19 14:45:09 +01:00

tests

New camera viewfinder settings API.

2015-01-13 13:34:41 +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

2015-01-16 21:06:40 +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.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%