Yoann Lopes a2244c9b7a Merge remote-tracking branch 'origin/5.5' into 5.6 ...

Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13

2015-08-24 14:36:13 +02:00

..

auto

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

2015-08-24 14:36:13 +02:00

global

tst_bic: Add linux-gcc-ia32 bic data for QtMultimediaWidgets

2013-01-15 13:45:49 +01:00

systemtests

Update copyright headers

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

tests.pro

Initial copy of QtMultimediaKit.

2011-06-29 13:38:46 +10:00