summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsharedmemory
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-09-28 10:19:00 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-09-28 10:19:00 (GMT)
commit0d781e36b1fecac919cb4ade55fd03e0f63b87c6 (patch)
tree3c9f233a81e00b76eaba3301af05a1ffb38e8abb /tests/auto/qsharedmemory
parentf8188b14493eb3d01263be5fef4ea086d3a542a0 (diff)
downloadQt-0d781e36b1fecac919cb4ade55fd03e0f63b87c6.zip
Qt-0d781e36b1fecac919cb4ade55fd03e0f63b87c6.tar.gz
Qt-0d781e36b1fecac919cb4ade55fd03e0f63b87c6.tar.bz2
Fixed qsharedmemory autotest compile break for Symbian OS
Reviewed-by: TrustMe
Diffstat (limited to 'tests/auto/qsharedmemory')
-rw-r--r--tests/auto/qsharedmemory/qsystemlock/qsystemlock.pro4
-rw-r--r--tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp9
2 files changed, 10 insertions, 3 deletions
diff --git a/tests/auto/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qsharedmemory/qsystemlock/qsystemlock.pro
index 2628f19..e232443 100644
--- a/tests/auto/qsharedmemory/qsystemlock/qsystemlock.pro
+++ b/tests/auto/qsharedmemory/qsystemlock/qsystemlock.pro
@@ -5,9 +5,9 @@ include(../src/src.pri)
win32: CONFIG += console
mac:CONFIG -= app_bundle
-wince*|symbian {
+wince* {
DEFINES += SRCDIR=\\\"\\\"
-} else {
+} else:!symbian {
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
diff --git a/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
index 87fc3ee..35f05d1 100644
--- a/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
+++ b/tests/auto/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
@@ -46,6 +46,13 @@
//TESTED_CLASS=
//TESTED_FILES=
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// And underlying Open C have application private dir in default search path
+#define SRCDIR ""
+#endif
+
+
#define EXISTING_SHARE "existing"
class tst_QSystemLock : public QObject
@@ -223,7 +230,7 @@ void tst_QSystemLock::processes()
QCOMPARE(consumers.first()->exitCode(), 0);
delete consumers.takeFirst();
}
- QCOMPARE(failedProcesses, unsigned int(0));
+ QCOMPARE(failedProcesses, (unsigned int)(0));
}
QTEST_MAIN(tst_QSystemLock)