summaryrefslogtreecommitdiffstats
path: root/tests/auto/multimedia.pro
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2010-04-27 00:39:42 (GMT)
committerPeter Yard <peter.yard@nokia.com>2010-04-27 00:39:42 (GMT)
commit88b2bf18c558d0e2f8a9268802f277212f17e61e (patch)
treed41ca52003037fba9b45605aa6d2ed86f73b940a /tests/auto/multimedia.pro
parent4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66 (diff)
parent09293f1d07b019dc7bfe95afb93364cc87774e82 (diff)
downloadQt-88b2bf18c558d0e2f8a9268802f277212f17e61e.zip
Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.gz
Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/multimedia.pro')
-rw-r--r--tests/auto/multimedia.pro17
1 files changed, 1 insertions, 16 deletions
diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro
index f55d6e4..0a89f53 100644
--- a/tests/auto/multimedia.pro
+++ b/tests/auto/multimedia.pro
@@ -6,21 +6,6 @@ SUBDIRS=\
qaudioformat \
qaudioinput \
qaudiooutput \
- qsoundeffect \
- qdeclarativeaudio \
- qdeclarativevideo \
- qgraphicsvideoitem \
- qmediacontent \
- qmediaobject \
- qmediaplayer \
- qmediaplaylist \
- qmediaplaylistnavigator \
- qmediapluginloader \
- qmediaresource \
- qmediaservice \
- qmediaserviceprovider \
- qmediatimerange \
qvideoframe \
- qvideosurfaceformat \
- qvideowidget \
+ qvideosurfaceformat