summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhawcroft <derick.hawcroft@nokia.com>2010-04-21 00:40:19 (GMT)
committerhawcroft <derick.hawcroft@nokia.com>2010-04-21 00:40:19 (GMT)
commit7f70505d3d768948fbc92fa55ecd590823764bec (patch)
treea488a4c38a73448975ebf534ee07c8e75c434664
parentf8ae6e9f9819023913699ca7370ea32ea8ab94b3 (diff)
downloadQt-7f70505d3d768948fbc92fa55ecd590823764bec.zip
Qt-7f70505d3d768948fbc92fa55ecd590823764bec.tar.gz
Qt-7f70505d3d768948fbc92fa55ecd590823764bec.tar.bz2
symbian: deploy 4.wav test file properly
Reviewed-by: Kurt Korbatits
-rw-r--r--tests/auto/qaudiooutput/qaudiooutput.pro8
-rw-r--r--tests/auto/qaudiooutput/tst_qaudiooutput.cpp7
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);