diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 23:49:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 23:49:38 (GMT) |
| commit | cca06c0d740be179d5196ad7919253b7d52392ed (patch) | |
| tree | eaa7be4f53fa9d91833db94c491593b540b17b31 /tests | |
| parent | b0c95377cadcaa3aa784ca909e13033c85233912 (diff) | |
| parent | 2c39814588782f9b30f5205258f72fe5c1dea358 (diff) | |
| download | Qt-cca06c0d740be179d5196ad7919253b7d52392ed.zip Qt-cca06c0d740be179d5196ad7919253b7d52392ed.tar.gz Qt-cca06c0d740be179d5196ad7919253b7d52392ed.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QDeclarativeDebug: stream all the context, including the internals ones.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index 4a945f3..20ccccb 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -636,7 +636,7 @@ void tst_QDeclarativeDebug::queryRootContexts() QCOMPARE(context.objects()[0].properties().count(), 0); QCOMPARE(context.objects()[0].children().count(), 0); - QCOMPARE(context.contexts().count(), 1); + QCOMPARE(context.contexts().count(), 4); QVERIFY(context.contexts()[0].debugId() >= 0); QCOMPARE(context.contexts()[0].name(), QString("tst_QDeclarativeDebug_childContext")); |