qtmultimedia

Go to file

Liang Qi 6166f102f5 Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	src/plugins/android/src/wrappers/jni/androidcamera.cpp

Change-Id: Ibb34f710b1dfb9a23b378462f31432581c6c26f4

2016-01-07 11:13:47 +01:00

config.tests

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

2016-01-07 11:13:47 +01:00

dist

Add 5.5.1 change file.

2015-09-15 11:33:17 +00:00

examples

Fix for disallowed property bindings in qml effect files

2015-11-06 09:32:41 +00:00

src

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

2016-01-07 11:13:47 +01:00

tests

Blacklist tst_qmediaplayerbackend::seekInStoppedState() on RHEL.

2016-01-06 15:21:12 +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-06-29 10:47:53 +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.GPLv3

Add the GPLv3 license text

2015-08-13 15:07:55 +02:00

LICENSE.LGPLv3

Add the GPLv3 license text

2015-08-13 15:07:55 +02:00

LICENSE.LGPLv21

Update copyright headers

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

qtmultimedia.pro

DirectShow: use the EVR in the window control.

2015-11-05 11:34:55 +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%