summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-05-23 08:49:19 (GMT)
committerKai Koehne <kai.koehne@nokia.com>2011-05-23 08:49:19 (GMT)
commit565bd12bdc7b73e4222de44699df9904a1cfcd81 (patch)
treef3cb3986a375cb25962dbfe48a065804fc53b686 /tests
parent21711d7ad54b0ee83e776ac3ad83121221fdf24b (diff)
parentf1efb2e8866203cbf95d288ea0ccb1992413c3fc (diff)
downloadQt-565bd12bdc7b73e4222de44699df9904a1cfcd81.zip
Qt-565bd12bdc7b73e4222de44699df9904a1cfcd81.tar.gz
Qt-565bd12bdc7b73e4222de44699df9904a1cfcd81.tar.bz2
Merge remote branch 'qt-qml-review/master' into master-qml-staging
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 e63b14e..b0393c1 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);