summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-15 05:58:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-15 05:58:41 (GMT)
commit4b76c78f62a6d76044c0df5a9be616ce5e6b6508 (patch)
treee98a38a927b9cbdfb57e96c27d42353adc1e2a4d
parent8f3277d808e2f77661df0e28dfb8f4c6025258cb (diff)
parent24a7ea490394d5a1df0dfb323c8733d3ee76b539 (diff)
downloadQt-4b76c78f62a6d76044c0df5a9be616ce5e6b6508.zip
Qt-4b76c78f62a6d76044c0df5a9be616ce5e6b6508.tar.gz
Qt-4b76c78f62a6d76044c0df5a9be616ce5e6b6508.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Fixed error in unit test xml file.
-rw-r--r--tests/auto/tests.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/tests.xml b/tests/auto/tests.xml
index f197de0..efbc4b0 100644
--- a/tests/auto/tests.xml
+++ b/tests/auto/tests.xml
@@ -272,7 +272,7 @@
<Test name="qsocks5socketengine" location="tests/auto/qsocks5socketengine/tst_qsocks5socketengine" />
<Test name="qsortfilterproxymodel" location="tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel" />
<Test name="qsound" location="tests/auto/qsound/tst_qsound" />
- <Test name="qaudiodeviceid" location="tests/auto/qaudiodeviceid/tst_qaudiodeviceid" />
+ <Test name="qaudiodeviceinfo" location="tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo" />
<Test name="qaudioformat" location="tests/auto/qaudioformat/tst_qaudioformat" />
<Test name="qaudiooutput" location="tests/auto/qaudiooutput/tst_qaudiooutput" />
<Test name="qaudioinput" location="tests/auto/qaudioinput/tst_qaudioinput" />