diff options
Diffstat (limited to 'tests/auto/corelib/kernel/qobject/tst_qobject.cpp')
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/tst_qobject.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp index 2e2e58a90d..3ed3d25eeb 100644 --- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp +++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp @@ -1323,7 +1323,7 @@ Q_DECLARE_METATYPE(PropertyObject::Priority) void tst_QObject::threadSignalEmissionCrash() { -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) int loopCount = 100; #else int loopCount = 1000; @@ -1577,17 +1577,8 @@ void tst_QObject::moveToThread() connect(object, SIGNAL(theSignal()), &thread, SLOT(quit()), Qt::DirectConnection); -#if defined(Q_OS_SYMBIAN) - // Child timer will be registered after parent timer in the new - // thread, and 10ms is less than symbian timer resolution, so - // child->timerEventThread compare after thread.wait() will - // usually fail unless timers are farther apart. - child->startTimer(100); - object->startTimer(150); -#else child->startTimer(90); object->startTimer(100); -#endif QCOMPARE(object->thread(), currentThread); QCOMPARE(child->thread(), currentThread); @@ -2815,9 +2806,7 @@ void tst_QObject::dynamicProperties() void tst_QObject::recursiveSignalEmission() { -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - QSKIP("Emulator builds in Symbian do not support launching processes linking to Qt", SkipAll); -#elif defined(QT_NO_PROCESS) +#if defined(QT_NO_PROCESS) QSKIP("Test requires QProcess", SkipAll); #else QProcess proc; |