diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-10-18 13:34:20 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-20 13:25:31 +0200 |
commit | 84af8c0ca510366a3017c1af83abc1cd18009198 (patch) | |
tree | 72a8571c8150f9d383eb7de03fc04fa9de9ab4f9 /tests/auto/declarative/qdeclarativeincubator/testtypes.cpp | |
parent | 0db8440681ed0d1ea9baeda21dd71bb2e331bea2 (diff) |
Behave correctly when AsynchronousIfNested is nested
When AIN is nested within a synchronous AIN, it should behave
synchronously.
Change-Id: Ib3f8281667118d7787967f25e27797f67e581006
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeincubator/testtypes.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeincubator/testtypes.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeincubator/testtypes.cpp b/tests/auto/declarative/qdeclarativeincubator/testtypes.cpp index 3ff15a71af..99d2cb1005 100644 --- a/tests/auto/declarative/qdeclarativeincubator/testtypes.cpp +++ b/tests/auto/declarative/qdeclarativeincubator/testtypes.cpp @@ -82,8 +82,28 @@ void CompletionRegisteringType::clearMe() m_me = 0; } +CallbackRegisteringType::callback CallbackRegisteringType::m_callback = 0; +void *CallbackRegisteringType::m_data = 0; +CallbackRegisteringType::CallbackRegisteringType() +: m_v(0) +{ +} + +void CallbackRegisteringType::clearCallback() +{ + m_callback = 0; + m_data = 0; +} + +void CallbackRegisteringType::registerCallback(callback c, void *d) +{ + m_callback = c; + m_data = d; +} + void registerTypes() { qmlRegisterType<SelfRegisteringType>("Qt.test", 1,0, "SelfRegistering"); qmlRegisterType<CompletionRegisteringType>("Qt.test", 1,0, "CompletionRegistering"); + qmlRegisterType<CallbackRegisteringType>("Qt.test", 1,0, "CallbackRegistering"); } |