diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 23:40:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 23:40:54 (GMT) |
| commit | 59852c9a855e6b9963c27c9a028faf6d23ea9974 (patch) | |
| tree | 2b3b679a77365027886a57671fe4763987d7963d /tests | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| parent | 565bd12bdc7b73e4222de44699df9904a1cfcd81 (diff) | |
| download | Qt-59852c9a855e6b9963c27c9a028faf6d23ea9974.zip Qt-59852c9a855e6b9963c27c9a028faf6d23ea9974.tar.gz Qt-59852c9a855e6b9963c27c9a028faf6d23ea9974.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix autotest
Pass QList as const reference when possible
Fixed crashes in Observer mode related to infinite bounding rects
Doc
QmlDirParser: Fix typeInfo accessor.
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 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); |