diff options
| author | mread <qt-info@nokia.com> | 2009-08-10 09:58:56 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-10 09:58:56 (GMT) |
| commit | 28de6f106cf788b7e3bedb3461c1df3d272e185c (patch) | |
| tree | a38c4356ebad38737c5c6f657c8ad2b5f0cac3b0 | |
| parent | 921eaf6bf3a1420ff9ce8f797c60247da80110ab (diff) | |
| parent | 2d5381360cb3b63a840dfdc7078ce6156bc28e39 (diff) | |
| download | Qt-28de6f106cf788b7e3bedb3461c1df3d272e185c.zip Qt-28de6f106cf788b7e3bedb3461c1df3d272e185c.tar.gz Qt-28de6f106cf788b7e3bedb3461c1df3d272e185c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | tests/auto/collections/tst_collections.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/qdir/tst_qdir.cpp | 2 |
2 files changed, 7 insertions, 3 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) } 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) |