diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 06:35:51 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-15 06:35:51 (GMT) |
| commit | 30a3e78a12b72ab6f67992ec2f06cd4f21a01a6c (patch) | |
| tree | bb480e0a908016f24a4e57755b2265ebf5b5ea16 /tests/auto/declarative/qdeclarativecontext | |
| parent | 6362d17d5551749618f5975e050c54fca31c408f (diff) | |
| download | Qt-30a3e78a12b72ab6f67992ec2f06cd4f21a01a6c.zip Qt-30a3e78a12b72ab6f67992ec2f06cd4f21a01a6c.tar.gz Qt-30a3e78a12b72ab6f67992ec2f06cd4f21a01a6c.tar.bz2 | |
Add Component.onDestruction attached property
This property complements Component.onCompleted. It is emitted before
the destruction actually begins (for the most part) so the objects are
still alive and accessible.
The QtObject.onDestroyed signal is now blocked as it never really worked
properly anyway.
Diffstat (limited to 'tests/auto/declarative/qdeclarativecontext')
| -rw-r--r-- | tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp index 35cffdc..851460f 100644 --- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp +++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp @@ -172,8 +172,8 @@ void tst_qdeclarativecontext::parentContext() delete ctxt2; ctxt2 = 0; QCOMPARE(ctxt->parentContext(), engine->rootContext()); - QCOMPARE(ctxt3->parentContext(), ctxt2); - QCOMPARE(ctxt4->parentContext(), ctxt2); + QCOMPARE(ctxt3->parentContext(), (QDeclarativeContext *)0); + QCOMPARE(ctxt4->parentContext(), (QDeclarativeContext *)0); QCOMPARE(ctxt5->parentContext(), ctxt); QCOMPARE(ctxt6->parentContext(), engine->rootContext()); QCOMPARE(ctxt7->parentContext(), engine->rootContext()); @@ -181,9 +181,9 @@ void tst_qdeclarativecontext::parentContext() delete engine; engine = 0; QCOMPARE(ctxt->parentContext(), (QDeclarativeContext *)0); - QCOMPARE(ctxt3->parentContext(), ctxt2); - QCOMPARE(ctxt4->parentContext(), ctxt2); - QCOMPARE(ctxt5->parentContext(), ctxt); + QCOMPARE(ctxt3->parentContext(), (QDeclarativeContext *)0); + QCOMPARE(ctxt4->parentContext(), (QDeclarativeContext *)0); + QCOMPARE(ctxt5->parentContext(), (QDeclarativeContext *)0); QCOMPARE(ctxt6->parentContext(), (QDeclarativeContext *)0); QCOMPARE(ctxt7->parentContext(), (QDeclarativeContext *)0); |