From 6631bb3c53ff89aefba9ac7fd742afa17f51c9c1 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 10 Aug 2009 09:47:54 +0300
Subject: Fixed compilation error in qdir autotest for Symbian.

---
 tests/auto/qdir/tst_qdir.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index 549e9d1..16f6eea 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -638,7 +638,7 @@ void tst_QDir::entryList()
         return;
     }
     bool doContentCheck = true;
-#ifdef Q_OS_UNIX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     if (qstrcmp(QTest::currentDataTag(), "QDir::AllEntries | QDir::Writable") == 0) {
         // for root, everything is writeable
         if (::getuid() == 0)
-- 
cgit v0.12


From 2d5381360cb3b63a840dfdc7078ce6156bc28e39 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 10 Aug 2009 10:31:02 +0300
Subject: Fixed collections autotests compilation for RVCT. RVCT can't
 apparently handle forward declared template parameters if those are used to
 declare class members inside templated class.

---
 tests/auto/collections/tst_collections.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp
index 6102530..cb95c08 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/collections/tst_collections.cpp
@@ -992,7 +992,7 @@ void tst_Collections::linkedList()
         QVERIFY(*(list.begin() + 2) == "alpha");
         QVERIFY(*(list.begin() + 3) == "beta");
     }
-    
+
     {
         QLinkedList<int> a;
         QCOMPARE(a.startsWith(1), false);
@@ -3453,7 +3453,7 @@ class Key1
 class T1
 {};
 class T2
-};
+{};
 #else
 class Key1;
 class T1;
@@ -3468,7 +3468,11 @@ void tst_Collections::forwardDeclared()
     { typedef QMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
     { typedef QMultiMap<Key1, T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
 #endif
+#if !defined(Q_CC_RVCT)
+    // RVCT can't handle forward declared template parameters if those are used to declare
+    // class members inside templated class.
     { typedef QPair<T1, T2> C; C *x = 0; Q_UNUSED(x) }
+#endif
     { typedef QList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
     { typedef QLinkedList<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) }
     { typedef QVector<T1> C; C *x = 0; C::iterator i; C::const_iterator j; Q_UNUSED(x) Q_UNUSED(i) Q_UNUSED(j) }
-- 
cgit v0.12