summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-03 11:32:07 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-03 11:32:07 (GMT)
commit1b18cf510e749dbaf120c1597b2ee57730fa4f3b (patch)
tree75452f3f6c4d03910b9266a9946e550c84fb7a45
parentae597a532683e5d544400b62497c870cf570b069 (diff)
downloadQt-1b18cf510e749dbaf120c1597b2ee57730fa4f3b.zip
Qt-1b18cf510e749dbaf120c1597b2ee57730fa4f3b.tar.gz
Qt-1b18cf510e749dbaf120c1597b2ee57730fa4f3b.tar.bz2
Fixed SRCDIR usage for Symbian in qtextcodec autotest
-rw-r--r--tests/auto/qtextcodec/test/test.pro5
-rw-r--r--tests/auto/qtextcodec/tst_qtextcodec.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro
index 7d4fdb3..7748ce4 100644
--- a/tests/auto/qtextcodec/test/test.pro
+++ b/tests/auto/qtextcodec/test/test.pro
@@ -6,7 +6,12 @@ wince*|symbian {
addFiles.path = .
DEPLOYMENT += addFiles
DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
+}
+
+wince*: {
DEFINES += SRCDIR=\\\"\\\"
+}else:symbian {
+ # Symbian can't define SRCDIR meaningfully here
} else {
DEFINES += SRCDIR=\\\"$$PWD/../\\\"
}
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index 750b4ec..5899b10 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -48,6 +48,11 @@
#include <time.h>
#include <qprocess.h>
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
+
class tst_QTextCodec : public QObject
{
Q_OBJECT