Liang Qi 112595bf80 Merge remote-tracking branch 'origin/5.5' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af

2015-06-29 20:10:15 +02:00

config.tests

Update copyright headers

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

dist

Added 5.5.0 change file.

2015-06-11 16:14:37 +00:00

examples

Doc: Use the screenshot in the Declarative Radio example documentation

2015-05-19 10:09:34 +00:00

src

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

2015-06-29 20:10:15 +02:00

tests

Blacklist part of tst_qaudiodeviceinfo

2015-06-29 12:22:16 +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.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

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%