From 9f947d40ad772068b2147aff4f4374dc8c0caf30 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Fri, 14 Jul 2017 10:16:47 +0200
Subject: [PATCH] Speculative stabilization of imeCompositionQueryEvent widget
auto test
Wait for receiver object to be set after show.
Task-number: QTBUG-61816
Change-Id: I2eb62775d30b0f8f9ec3e76d60a924b56c811865
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
.../widgets/qwebengineview/tst_qwebengineview.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 7fbbd63d3..c9d5cda90 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -2152,14 +2152,16 @@ void tst_QWebEngineView::imeCompositionQueryEvent()
QObject *input = nullptr;
QFETCH(QString, receiverObjectName);
- if (receiverObjectName == "focusObject")
+ if (receiverObjectName == "focusObject") {
+ QTRY_VERIFY(qApp->focusObject());
input = qApp->focusObject();
- else if (receiverObjectName == "focusProxy")
+ } else if (receiverObjectName == "focusProxy") {
+ QTRY_VERIFY(view.focusProxy());
input = view.focusProxy();
- else if (receiverObjectName == "focusWidget")
+ } else if (receiverObjectName == "focusWidget") {
+ QTRY_VERIFY(view.focusWidget());
input = view.focusWidget();
-
- QVERIFY(input);
+ }
QInputMethodQueryEvent srrndTextQuery(Qt::ImSurroundingText);
QInputMethodQueryEvent cursorPosQuery(Qt::ImCursorPosition);
--
GitLab