summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-11 13:21:49 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-11 13:21:49 (GMT)
commit06f5b06d05cd994f22cf2e3bce5c4a5e7560fd19 (patch)
treea4d9a12bc47f49b649581047ddf940fa8f0ac933
parent08274bc50ae1280102b43a9b7fd71e6ec6ba9254 (diff)
downloadQt-06f5b06d05cd994f22cf2e3bce5c4a5e7560fd19.zip
Qt-06f5b06d05cd994f22cf2e3bce5c4a5e7560fd19.tar.gz
Qt-06f5b06d05cd994f22cf2e3bce5c4a5e7560fd19.tar.bz2
Fixed qtextstream autotest for Symbian
-rw-r--r--tests/auto/qtextstream/test/test.pro8
-rw-r--r--tests/auto/qtextstream/tst_qtextstream.cpp2
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro
index 973c011..9f117d5 100644
--- a/tests/auto/qtextstream/test/test.pro
+++ b/tests/auto/qtextstream/test/test.pro
@@ -26,11 +26,15 @@ wince*|symbian: {
}
wince*: {
- DEFINES += SRCDIR=\\\"\\\"
+ DEFINES += SRCDIR=\\\"\\\"
}else:symbian {
+ load(data_caging_paths)
# Symbian can't define SRCDIR meaningfully here
+ codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
+ codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
+ DEPLOYMENT += codecs_plugins
}else {
- DEFINES += SRCDIR=\\\"$$PWD/../\\\"
+ DEFINES += SRCDIR=\\\"$$PWD/../\\\"
}
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp
index d8dd618..757bbce 100644
--- a/tests/auto/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp
@@ -473,6 +473,8 @@ tst_QTextStream::tst_QTextStream()
inBuffer = 0;
inString = 0;
file_is_empty = FALSE;
+
+ Q_SET_DEFAULT_IAP
}
tst_QTextStream::~tst_QTextStream()