diff -r 5dc02b23752f -r 3e2da88830cd tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp --- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -47,9 +47,15 @@ #include #include #include "testhttpserver.h" +#include "../../../shared/util.h" #define SERVER_PORT 14450 +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + inline QUrl TEST_FILE(const QString &filename) { return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename); @@ -171,9 +177,7 @@ QCOMPARE(loader->progress(), 1.0); QCOMPARE(static_cast(loader)->children().count(), 1); - QTest::qWait(500); - - QVERIFY(loader->item() == 0); + QTRY_VERIFY(loader->item() == 0); QCOMPARE(loader->progress(), 0.0); QCOMPARE(loader->status(), QDeclarativeLoader::Null); QCOMPARE(static_cast(loader)->children().count(), 0); @@ -234,8 +238,8 @@ "}" ) , TEST_FILE("")); QDeclarativeLoader *loader = qobject_cast(component.create()); - QTest::qWait(500); - QVERIFY(loader != 0); + QTest::qWait(200); + QTRY_VERIFY(loader != 0); QVERIFY(loader->item()); QCOMPARE(loader->progress(), 1.0); QCOMPARE(static_cast(loader)->children().count(), 1);