possible tst_QListWidget::QTBUG14363_completerWithAnyKeyPressedEditTriggers() test fix

upstream commits:
https://github.com/qt/qtbase/commit/384eec86e5da7eb789bb0231f6de8b0c1c038e03
https://github.com/qt/qtbase/commit/52484cc4b6696c8a5c1f69125d81eb0cede8cdb2

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/README b/README
index 298da66..a068817 100644 (file)
--- a/README
+++ b/README
@@ -88,7 +88,7 @@ QTBUG-12564, QTBUG-20028, QTBUG-71967, QTBUG-70956, QTBUG-71446, QTBUG-61307,
 QTBUG-27287, QTBUG-25143, QTBUG-22833, QTBUG-57399, QTBUG-59159, QTBUG-15773,
 QTBUG-70506, QTBUG-46054, QTBUG-11223, QTBUG-63108, QTBUG-6932, QTBUG-42365,
 QTBUG-83817, QTBUG-4341, QTBUG-36933, QTBUG-49113, QTBUG-69920, QTBUG-40015,
-QTBUG-54942, QTBUG-91261, QTBUG-73445
+QTBUG-54942, QTBUG-91261, QTBUG-73445, QTBUG-21098
 
 Unless you use QMake and QDoc porting to Katie or even supporting it along with
 Qt4 in the same codebase is trivial and requires only minor changes because

diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index fadbfe1..5244619 100644 (file)
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -1649,6 +1649,8 @@ void tst_QListWidget::QTBUG14363_completerWithAnyKeyPressedEditTriggers()
     listWidget.show();
     listWidget.setCurrentItem(item);
     QTest::qWaitForWindowShown(&listWidget);
+    listWidget.setFocus();
+    QCOMPARE(qApp->focusWidget(), &listWidget);
 
     QTest::keyClick(listWidget.viewport(), Qt::Key_C);