diff options
| -rw-r--r-- | src/quick/util/qquickanimatorcontroller_p.h | 3 | ||||
| -rw-r--r-- | tests/auto/quick/qquickanimators/tst_qquickanimators.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/util/qquickanimatorcontroller_p.h b/src/quick/util/qquickanimatorcontroller_p.h index 9c345b8152..c567c8ad43 100644 --- a/src/quick/util/qquickanimatorcontroller_p.h +++ b/src/quick/util/qquickanimatorcontroller_p.h @@ -93,10 +93,11 @@ public: QQuickWindow *window() const { return m_window; } private: + friend class tst_Animators; + void start_helper(QAbstractAnimationJob *job); void cancel_helper(QAbstractAnimationJob *job); -public: QSet<QQuickAnimatorJob * > m_runningAnimators; QHash<QAbstractAnimationJob *, QSharedPointer<QAbstractAnimationJob> > m_animationRoots; QSet<QSharedPointer<QAbstractAnimationJob> > m_rootsPendingStop; diff --git a/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp b/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp index 34aace57a0..30a1d5a560 100644 --- a/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp +++ b/tests/auto/quick/qquickanimators/tst_qquickanimators.cpp @@ -42,6 +42,8 @@ using namespace QQuickViewTestUtil; +QT_BEGIN_NAMESPACE + class tst_Animators: public QQmlDataTest { Q_OBJECT @@ -180,6 +182,8 @@ void tst_Animators::testTransitionsWithImplicitFrom() QVERIFY(controller->m_runningAnimators.isEmpty()); } +QT_END_NAMESPACE + QTEST_MAIN(tst_Animators) #include "tst_qquickanimators.moc" |