From 06f5b06d05cd994f22cf2e3bce5c4a5e7560fd19 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 11 Aug 2009 16:21:49 +0300
Subject: Fixed qtextstream autotest for Symbian

---
 tests/auto/qtextstream/test/test.pro       | 8 ++++++--
 tests/auto/qtextstream/tst_qtextstream.cpp | 2 ++
 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()
-- 
cgit v0.12