diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 04:52:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 04:52:38 (GMT) |
| commit | db9a3bedc9a3c99db83fb8d45255e36e57b8d0ec (patch) | |
| tree | f35de23e51da20fff56cc632bcd3edd322a3937a | |
| parent | 54cf827951ce95403f464c4b3351a32640836abf (diff) | |
| parent | 0f1786106ff115f05b43d8dc5111047ca277843f (diff) | |
| download | Qt-db9a3bedc9a3c99db83fb8d45255e36e57b8d0ec.zip Qt-db9a3bedc9a3c99db83fb8d45255e36e57b8d0ec.tar.gz Qt-db9a3bedc9a3c99db83fb8d45255e36e57b8d0ec.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Compile on symbian:
| -rw-r--r-- | tests/auto/qaudioinput/qaudioinput.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qaudioinput/tst_qaudioinput.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro index f545a11..5eb1613 100644 --- a/tests/auto/qaudioinput/qaudioinput.pro +++ b/tests/auto/qaudioinput/qaudioinput.pro @@ -10,6 +10,6 @@ wince* { DEFINES += SRCDIR=\\\"\\\" QT += gui } else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" + !symbian:DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp index 40b7fbb..84c3874 100644 --- a/tests/auto/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp @@ -46,6 +46,9 @@ #include <qaudio.h> #include <qaudioformat.h> +#if defined(Q_OS_SYMBIAN) +#define SRCDIR "" +#endif class tst_QAudioInput : public QObject { @@ -130,7 +133,7 @@ void tst_QAudioInput::notifyInterval() void tst_QAudioInput::pullFile() { if(available) { - QFile filename(SRCDIR "test.raw"); + QFile filename(SRCDIR"test.raw"); filename.open( QIODevice::WriteOnly | QIODevice::Truncate ); QSignalSpy readSignal(audio, SIGNAL(notify())); |