diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-21 00:56:33 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-21 00:56:33 (GMT) |
| commit | c7eed5ccad051e4287693dda6dfaf7f7326620fd (patch) | |
| tree | f00778abd627e6e78bb87794416f5581c1e41d6f | |
| parent | f94ba8c005085ebc438360a4607d00d5584c355e (diff) | |
| parent | 7f70505d3d768948fbc92fa55ecd590823764bec (diff) | |
| download | Qt-c7eed5ccad051e4287693dda6dfaf7f7326620fd.zip Qt-c7eed5ccad051e4287693dda6dfaf7f7326620fd.tar.gz Qt-c7eed5ccad051e4287693dda6dfaf7f7326620fd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
| -rw-r--r-- | tests/auto/qaudiooutput/qaudiooutput.pro | 8 | ||||
| -rw-r--r-- | tests/auto/qaudiooutput/tst_qaudiooutput.cpp | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/qaudiooutput/qaudiooutput.pro index 8657edb..a6286ec 100644 --- a/tests/auto/qaudiooutput/qaudiooutput.pro +++ b/tests/auto/qaudiooutput/qaudiooutput.pro @@ -4,11 +4,13 @@ SOURCES += tst_qaudiooutput.cpp QT = core multimedia -wince* { +wince*|symbian*: { deploy.sources += 4.wav DEPLOYMENT = deploy - DEFINES += SRCDIR=\\\"\\\" - QT += gui + !symbian { + DEFINES += SRCDIR=\\\"\\\" + QT += gui + } } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp index aeb2286..437ef5e 100644 --- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp @@ -48,6 +48,9 @@ #include <qaudio.h> #include <qaudioformat.h> +#if defined(Q_OS_SYMBIAN) +#define SRCDIR "" +#endif class tst_QAudioOutput : public QObject { @@ -131,7 +134,7 @@ void tst_QAudioOutput::notifyInterval() void tst_QAudioOutput::pullFile() { if(available) { - QFile file(SRCDIR "4.wav"); + QFile file(SRCDIR"4.wav"); QVERIFY(file.exists()); file.open(QIODevice::ReadOnly); @@ -178,7 +181,7 @@ void tst_QAudioOutput::pullFile() void tst_QAudioOutput::pushFile() { if(available) { - QFile file(SRCDIR "4.wav"); + QFile file(SRCDIR"4.wav"); QVERIFY(file.exists()); file.open(QIODevice::ReadOnly); |