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

..

bic/data

Fix bic autotest

2013-04-29 15:13:02 +02:00

cmake

Test the cmake multimediawidgets module only if widgets is available.

2013-03-14 19:33:59 +01:00

integration

Fix build without Qml and Quick modules.

2014-01-16 15:56:19 +01:00

unit

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

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

auto.pro

Test that the package configs for QtMultimedia work.

2012-07-20 07:28:09 +02:00

runautotests.py

Update copyright year in Digia's license headers

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