summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSami Lempinen <sami.lempinen@nokia.com>2011-05-26 07:36:07 (GMT)
committerSami Lempinen <sami.lempinen@nokia.com>2011-05-26 07:36:07 (GMT)
commit7b8ab60fce675afd57d9dcd8253585cc102bc580 (patch)
treeeefe1fb653e561cd03ba6931513f560c88e23c04 /tests
parent3060da958981af8074ac68e47c30c519ff60eec9 (diff)
parent59852c9a855e6b9963c27c9a028faf6d23ea9974 (diff)
downloadQt-7b8ab60fce675afd57d9dcd8253585cc102bc580.zip
Qt-7b8ab60fce675afd57d9dcd8253585cc102bc580.tar.gz
Qt-7b8ab60fce675afd57d9dcd8253585cc102bc580.tar.bz2
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp2
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 361d7f3..8871e45 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -1027,7 +1027,7 @@ void tst_QDeclarativeDebug::setBindingForObject()
// set handler
//
rootObject = findRootObject();
- QCOMPARE(rootObject.children().size(), 4); // Rectangle, Text, MouseArea, QDeclarativeComponentAttached
+ QCOMPARE(rootObject.children().size(), 5); // Rectangle, Text, MouseArea, Component.onCompleted, NonScriptPropertyElement
QDeclarativeDebugObjectReference mouseAreaObject = rootObject.children().at(2);
QDeclarativeDebugObjectQuery *q_obj = m_dbg->queryObjectRecursive(mouseAreaObject, this);
waitForQuery(q_obj);