diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-06 06:59:08 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-06 06:59:08 (GMT) |
| commit | 771f2d93ba063591343578b6cdb3c18a6a09c49c (patch) | |
| tree | cc34b29ba2486757136bbe9169b9c3a140afb0de /tests | |
| parent | 180bdb06feed8c5fe08f88b9eb16b7676615851f (diff) | |
| parent | 2a18238357e3442a2e9a6eb2fe8b9ff78704c174 (diff) | |
| download | Qt-771f2d93ba063591343578b6cdb3c18a6a09c49c.zip Qt-771f2d93ba063591343578b6cdb3c18a6a09c49c.tar.gz Qt-771f2d93ba063591343578b6cdb3c18a6a09c49c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qsound/qsound.pro | 6 | ||||
| -rw-r--r-- | tests/auto/qsound/tst_qsound.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/qsound/qsound.pro b/tests/auto/qsound/qsound.pro index 75da2e6..c48d50d 100644 --- a/tests/auto/qsound/qsound.pro +++ b/tests/auto/qsound/qsound.pro @@ -4,4 +4,8 @@ SOURCES += tst_qsound.cpp wince*|symbian*: { deploy.sources += 4.wav DEPLOYMENT = deploy -}
\ No newline at end of file + DEFINES += SRCDIR=\\\"\\\" +} else { + DEFINES += SRCDIR=\\\"$$PWD/\\\" +} + diff --git a/tests/auto/qsound/tst_qsound.cpp b/tests/auto/qsound/tst_qsound.cpp index 76451e3..dd5f2ce 100644 --- a/tests/auto/qsound/tst_qsound.cpp +++ b/tests/auto/qsound/tst_qsound.cpp @@ -56,7 +56,7 @@ private slots: void tst_QSound::checkFinished() { - QSound sound("4.wav"); + QSound sound(SRCDIR"4.wav"); sound.setLoops(3); sound.play(); QTest::qWait(5000); |