diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-10-06 10:10:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 03:13:27 +0200 |
| commit | 8ce0fcdd068f91353fb069d38e2ecf214015ef16 (patch) | |
| tree | 13c09c702005f7fc986bc583b9360a8cb8284340 /tests/auto/declarative/qsglistview | |
| parent | e29f198b2a91b30678ebeea0d4908634e7c2b5be (diff) | |
Fix waiting for active window breakage
Use QTRY_COMPARE(view == qGuiApp->focusWindow());
Change-Id: If5934f4355d9eb8da343f98277e3528f56926cd9
Fixes: QTBUG-21682, QTBUG-21683, QTBUG-21687, QTBUG-21680
Reviewed-on: http://codereview.qt-project.org/6087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qsglistview')
| -rw-r--r-- | tests/auto/declarative/qsglistview/incrementalmodel.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qsglistview/tst_qsglistview.cpp | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tests/auto/declarative/qsglistview/incrementalmodel.cpp b/tests/auto/declarative/qsglistview/incrementalmodel.cpp index 4b8e3cf6fa..53d30915f5 100644 --- a/tests/auto/declarative/qsglistview/incrementalmodel.cpp +++ b/tests/auto/declarative/qsglistview/incrementalmodel.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "incrementalmodel.h" -#include <QApplication> +#include <QGuiApplication> #include <QDebug> IncrementalModel::IncrementalModel(QObject *parent) diff --git a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp index 101f0fcbfd..6e8b247848 100644 --- a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp +++ b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp @@ -1953,19 +1953,12 @@ void tst_QSGListView::currentIndex() // Test keys canvas->show(); canvas->requestActivateWindow(); -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(canvas); -#endif - - qApp->processEvents(); + QTest::qWaitForWindowShown(canvas); + QTRY_VERIFY(qGuiApp->focusWindow() == canvas); listview->setCurrentIndex(0); QTest::keyClick(canvas, Qt::Key_Down); -#ifdef QT_BUILD_INTERNAL - QEXPECT_FAIL("", "QTBUG-21682 - Waiting for active window fails for developer build", Abort); -#endif QCOMPARE(listview->currentIndex(), 1); QTest::keyClick(canvas, Qt::Key_Up); |