diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-10-22 14:04:34 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-10-22 14:06:04 (GMT) |
commit | 44aa15a08dd8e7e1ea428fd8868a8e531f5ba4d9 (patch) | |
tree | c3ea2d5c29d88d5a8a48d47780f8335bce05d7c3 /tests/auto/qparallelanimationgroup | |
parent | 63b8a706c57ed292d82fc16a446daa543cf12a38 (diff) | |
download | Qt-44aa15a08dd8e7e1ea428fd8868a8e531f5ba4d9.zip Qt-44aa15a08dd8e7e1ea428fd8868a8e531f5ba4d9.tar.gz Qt-44aa15a08dd8e7e1ea428fd8868a8e531f5ba4d9.tar.bz2 |
Autotest fix for parallel animation group
On macos (as on symbian), we need to leave some time for the
application to become responsive.
Diffstat (limited to 'tests/auto/qparallelanimationgroup')
-rw-r--r-- | tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp index 8578d36..8d937e9 100644 --- a/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp +++ b/tests/auto/qparallelanimationgroup/tst_qparallelanimationgroup.cpp @@ -56,8 +56,7 @@ public: virtual ~tst_QParallelAnimationGroup(); public Q_SLOTS: - void init(); - void cleanup(); + void initTestCase(); private slots: void construction(); @@ -86,13 +85,13 @@ tst_QParallelAnimationGroup::~tst_QParallelAnimationGroup() { } -void tst_QParallelAnimationGroup::init() +void tst_QParallelAnimationGroup::initTestCase() { qRegisterMetaType<QAbstractAnimation::State>("QAbstractAnimation::State"); -} - -void tst_QParallelAnimationGroup::cleanup() -{ +#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAC) || defined(Q_WS_WINCE) + // give the Symbian and mac app start event queue time to clear + QTest::qWait(1000); +#endif } void tst_QParallelAnimationGroup::construction() @@ -486,10 +485,6 @@ void tst_QParallelAnimationGroup::updateChildrenWithRunningGroup() void tst_QParallelAnimationGroup::deleteChildrenWithRunningGroup() { -#if defined(Q_OS_SYMBIAN) - // give the Symbian app start event queue time to clear - QTest::qWait(1000); -#endif // test if children can be activated when their group is stopped QParallelAnimationGroup group; |