diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 08:00:23 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 08:00:23 (GMT) |
commit | fb80e2646874919f9ae8c459b21c190ff89e839b (patch) | |
tree | 3e87ff5fa0c93f62d174d2af6980b64444a16ec0 /tests/auto/phonon.pro | |
parent | 9b3c0bfb17600afff73294f4e549e0629709cfe0 (diff) | |
parent | b0323ac9e117397509de898b21d63767eddfb289 (diff) | |
download | Qt-fb80e2646874919f9ae8c459b21c190ff89e839b.zip Qt-fb80e2646874919f9ae8c459b21c190ff89e839b.tar.gz Qt-fb80e2646874919f9ae8c459b21c190ff89e839b.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed duplicate entry for windowsmobile in tests/auto/*.pro
Do not process uic3 test unless qt3support is enabled.
Make `make check' build the checked project.
Move tests into separate .pro files, based on Qt module.
Diffstat (limited to 'tests/auto/phonon.pro')
-rw-r--r-- | tests/auto/phonon.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/phonon.pro b/tests/auto/phonon.pro new file mode 100644 index 0000000..7549428 --- /dev/null +++ b/tests/auto/phonon.pro @@ -0,0 +1,5 @@ +TEMPLATE=subdirs +SUBDIRS=\ + mediaobject \ +# mediaobject_wince_ds9 \ This is Windows CE only (we test the second phonon backend ds9 here) + |