Sergio Ahumada 41a1c16340 Merge remote-tracking branch 'origin/5.3' into 5.4 ...

Conflicts:
	.qmake.conf

Change-Id: Iad73368a22c6d4662188e6f357a265d0c26756d0

2014-09-26 15:28:44 +02:00

..

auto

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

2014-09-26 15:28:44 +02:00

global

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

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

systemtests

Update copyright year in Digia's license headers

2013-01-10 17:56:01 +01:00

tests.pro

Initial copy of QtMultimediaKit.

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