diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-10 13:10:22 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-10 13:10:22 (GMT) |
| commit | 70e098d965318651acb725374b73e026f2946b76 (patch) | |
| tree | 88a239f2e4005721ab3d2e30c269e6c7ea0659ed /tests | |
| parent | 5ed8336dff99bd9f86f435e8e0a58adc6890cc51 (diff) | |
| parent | 7868384261dd74f8cf44684a69fe095957bafd4b (diff) | |
| download | Qt-70e098d965318651acb725374b73e026f2946b76.zip Qt-70e098d965318651acb725374b73e026f2946b76.tar.gz Qt-70e098d965318651acb725374b73e026f2946b76.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qeventloop/tst_qeventloop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp index 6b113e0..fe0d1c2 100644 --- a/tests/auto/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/qeventloop/tst_qeventloop.cpp @@ -222,6 +222,7 @@ void tst_QEventLoop::init() void tst_QEventLoop::cleanup() { } +#ifdef Q_OS_SYMBIAN class OnlySymbianActiveScheduler_helper : public QObject { Q_OBJECT @@ -243,10 +244,8 @@ public slots: // Let all the events occur twice so we know they reactivated after // each occurrence. if (++timerCount >= 2) { -#ifdef Q_OS_SYMBIAN // This will hopefully run last, so stop the active scheduler. CActiveScheduler::Stop(); -#endif } } void zeroTimerSlot() @@ -270,6 +269,7 @@ private: int zeroTimerCount; int notifierCount; }; +#endif void tst_QEventLoop::onlySymbianActiveScheduler() { #ifndef Q_OS_SYMBIAN |