diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
commit | 6a3945d3ca3185c00597dcaefb93617620973ff5 (patch) | |
tree | 0534630f29a2d513621adf33c6fb25085fcab220 /tests/auto/declarative | |
parent | 1690ad91cc9e686e688aa7832a16cbf2c9336948 (diff) | |
parent | 67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff) | |
download | Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.zip Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.gz Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative')
-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")); |