Frederik Gladhorn 74e4b59ec8 Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	src/plugins/plugins.pro

Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf

2013-08-12 12:47:02 +02:00

config.tests

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

2013-08-12 12:47:02 +02:00

dist

Add changes-5.1.0 file

2013-06-21 12:53:29 +02:00

examples

Remove left-over debug output.

2013-07-31 11:26:18 +02:00

src

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

2013-08-12 12:47:02 +02:00

tests

Multimedia plugins now have a unique JSON metadata 'Keys' property.

2013-06-21 12:07:00 +02: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 MODULE_VERSION to 5.1.2

2013-07-24 11:52:35 +02: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.GPL

Add license files mandated by (L)GPL.

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

LICENSE.LGPL

Add license files mandated by (L)GPL.

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

qtmultimedia.pro

Merge branch 'stable' into dev

2013-08-05 10:38:25 +02:00

sync.profile

sync.profile: Point dependencies to an empty string

2013-05-26 06:04:57 +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%