qtmultimedia

Go to file

Yoann Lopes 9d2943bce8 Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf
	src/plugins/avfoundation/camera/avfcamerasession.h
	src/plugins/avfoundation/camera/avfcamerasession.mm

Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85

2015-05-05 11:48:21 +02:00

config.tests

Update copyright headers

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

dist

Added 5.4.2 change file.

2015-04-25 07:20:03 +00:00

examples

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

2015-05-05 11:48:21 +02:00

src

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

2015-05-05 11:48:21 +02:00

tests

QMediaPlayer: handle resource files in a cross-platform way.

2015-04-07 17:21:47 +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-04-20 12:28:05 +02: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

Remove warning about missing qmake variable on Android.

2015-04-22 08:31:59 +00:00

sync.profile

Remove unnecessary dependency to qtjsbackend from sync.profile

2013-08-16 22:39:36 +02:00

Languages

C++ 90.5%

Objective-C++ 5.8%

QMake 1%

Objective-C 0.9%

QML 0.5%

Other 1%