diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-03-08 07:07:05 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-03-08 07:07:05 (GMT) |
commit | 4d8214afabd5e093c02b0de0e72f24139af6660f (patch) | |
tree | 0a9953e4e17b794ff3ff0da27711997a519b0aa1 /tests/auto/declarative | |
parent | bf6541626332d55f9521ee601f2eb71f7cd86c3d (diff) | |
download | Qt-4d8214afabd5e093c02b0de0e72f24139af6660f.zip Qt-4d8214afabd5e093c02b0de0e72f24139af6660f.tar.gz Qt-4d8214afabd5e093c02b0de0e72f24139af6660f.tar.bz2 |
Remove expect fail from ListView currentIndex test
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r-- | tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp index 1df4448..75fbbf8 100644 --- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp +++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp @@ -1028,13 +1028,17 @@ void tst_QDeclarativeListView::currentIndex() QCOMPARE(listview->contentY(), 0.0); // Test keys - qApp->setActiveWindow(canvas); canvas->show(); - canvas->setFocus(); + qApp->setActiveWindow(canvas); +#ifdef Q_WS_X11 + // to be safe and avoid failing setFocus with window managers + qt_x11_wait_for_window_manager(canvas); +#endif + QVERIFY(canvas->hasFocus()); + QVERIFY(canvas->scene()->hasFocus()); qApp->processEvents(); QTest::keyClick(canvas, Qt::Key_Down); - QEXPECT_FAIL("", "QTBUG-8475", Abort); QCOMPARE(listview->currentIndex(), 1); QTest::keyClick(canvas, Qt::Key_Up); |