diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 08:56:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 08:56:09 (GMT) |
| commit | 1b599a66e5c22dacd002f33ddaa00a6010e230b2 (patch) | |
| tree | d21e8c5ba974c3fa47cee7fc3f7fb1ede1e39127 /tests/auto | |
| parent | e3a9cb19d6f83e7e87a4909e0b0761ccd557c372 (diff) | |
| parent | 59e3430662cfdc3820115a2ff4c0b44829b3d1d4 (diff) | |
| download | Qt-1b599a66e5c22dacd002f33ddaa00a6010e230b2.zip Qt-1b599a66e5c22dacd002f33ddaa00a6010e230b2.tar.gz Qt-1b599a66e5c22dacd002f33ddaa00a6010e230b2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix broken example code
Top-level QML item should not have special focus handling.
Fix index page
Remove some warnings
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp index b138f61..ec8f048 100644 --- a/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp +++ b/tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp @@ -336,7 +336,7 @@ void tst_qdeclarativefocusscope::noParentFocus() view->setSource(QUrl::fromLocalFile(SRCDIR "/data/chain.qml")); QVERIFY(view->rootObject()); - QVERIFY(view->rootObject()->property("focus1") == true); + QVERIFY(view->rootObject()->property("focus1") == false); QVERIFY(view->rootObject()->property("focus2") == false); QVERIFY(view->rootObject()->property("focus3") == true); QVERIFY(view->rootObject()->property("focus4") == true); |