Frederik Gladhorn 422099e8dd Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	.qmake.conf

Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9

2014-01-17 17:20:59 +01:00

..

auto

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

2014-01-17 17:20:59 +01: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