diff options
author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-28 09:49:37 (GMT) |
---|---|---|
committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-04-28 09:49:37 (GMT) |
commit | e393f03cb89c795e4a638f84b002cb16fd1613a7 (patch) | |
tree | 1f9272e1dcf9f162682e9c3571ffb0e6aded1618 /tests/auto/auto.pro | |
parent | 1f00130097f81bc78aebb3c055f38c066221bc98 (diff) | |
parent | 3eded761167af317bab4f4d8c1ac0a12433eb03a (diff) | |
download | Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.zip Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.tar.gz Qt-e393f03cb89c795e4a638f84b002cb16fd1613a7.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r-- | tests/auto/auto.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c0004f7..12ebc75 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -16,6 +16,7 @@ unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro contains(QT_CONFIG, script): SUBDIRS += script.pro contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro +contains(QT_CONFIG, mediaservices): SUBDIRS += mediaservices.pro contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro contains(QT_CONFIG, svg): SUBDIRS += svg.pro contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro |