From a0b0ccdb8c72439d624696bd476a1d1ae722bc90 Mon Sep 17 00:00:00 2001 From: hawcroft Date: Wed, 21 Apr 2010 11:33:28 +1000 Subject: Compile on symbian: Symbian can't seem to handle defines declared in pro files defined as string literals. e.g DEFINES += FOO when FOO is then initialized as a string literal e.g DEFINES += FOO="bar" fails be included as a valid define during compilation. Reviewed-by:TrustMe --- tests/auto/qaudioinput/qaudioinput.pro | 2 +- 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 #include +#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())); -- cgit v0.12