diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-19 15:08:45 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-19 15:08:45 (GMT) |
| commit | aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5 (patch) | |
| tree | d8cdf354de1650927087b723cf1421cff8ee2972 /tests/auto/auto.pro | |
| parent | bbdee08472a0763ed9a60ce60f60ddb86bd946df (diff) | |
| parent | 477bf4379b0eb7b9a44f4730ce9b8fc07a8e635e (diff) | |
| download | Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.zip Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.tar.gz Qt-aaeb5a1f1e4d9ef6b24c3641ce1a0f9ba630b6d5.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index a9afa5d..a2c682b 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -153,8 +153,6 @@ SUBDIRS += \ qfontmetrics \ qftp \ qgetputenv \ - qgl \ - qgl_threads \ qglobal \ qgraphicseffect \ qgraphicseffectsource \ @@ -173,6 +171,7 @@ SUBDIRS += \ qgraphicsscene \ qgraphicssceneindex \ qgraphicstransform \ + qgraphicsvideoitem \ qgraphicsview \ qgraphicswidget \ qgridlayout \ @@ -301,6 +300,19 @@ SUBDIRS += \ qaudioformat \ qaudiooutput \ qaudioinput \ + qmediacontent \ + qmediaobject \ + qmediaplayer \ + qmediaplaylist \ + qmediaplaylistnavigator \ + qmediapluginloader \ + qmediaresource \ + qmediaservice \ + qmediaserviceprovider \ + qmediatimerange \ + qvideowidget \ + qmlaudio \ + qmlgraphicsvideo \ qspinbox \ qsplitter \ qsql \ @@ -465,7 +477,7 @@ SUBDIRS += \ rcc \ windowsmobile -contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer +contains(QT_CONFIG,opengl):SUBDIRS += qgl qglbuffer qgl_threads contains(QT_CONFIG,qt3support):!wince*:SUBDIRS += $$Q3SUBDIRS |