summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-05-26 09:50:26 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-26 09:50:26 (GMT)
commita7cdf620f4230ae7d1f45b56588f192edf6fb047 (patch)
treeba347c3cb746be05599e5c206225983454c12d82 /tests
parent3dcfbdc67b79944950ba7b24749e9d1642178bb1 (diff)
parent59852c9a855e6b9963c27c9a028faf6d23ea9974 (diff)
downloadQt-a7cdf620f4230ae7d1f45b56588f192edf6fb047.zip
Qt-a7cdf620f4230ae7d1f45b56588f192edf6fb047.tar.gz
Qt-a7cdf620f4230ae7d1f45b56588f192edf6fb047.tar.bz2
Merge remote-tracking branch 'origin/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);