Frederik Gladhorn 00c072bf0e Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	tests/auto/unit/qaudioformat/tst_qaudioformat.cpp

Change-Id: I8499473569df9eac8c7069160e42ed477dacad4d

2014-04-11 14:22:22 +02:00

..

auto

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

2014-04-11 14:22:22 +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