summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2018-06-09 20:05:26 +0200
committerFlorian Bruhin <git@the-compiler.org>2018-06-09 20:11:00 +0200
commitf7f96484e8b0d0bd732dcbf4870cf727b87e492d (patch)
treec1ec3c2ede0f6b3b61298995cf716bfff7fc890e
parent840d2e4423869706181f7ac82a2dd9866cf90002 (diff)
downloadqutebrowser-f7f96484e8b0d0bd732dcbf4870cf727b87e492d.tar.gz
qutebrowser-f7f96484e8b0d0bd732dcbf4870cf727b87e492d.zip
Fix waiting for initial focus object with Qt 5.11 workarounds
This was broken in d32d541ac0e3c00e5c17a7a04710567c61e5aaac because now apparently PyQt knows it's a QQuickWidget. (cherry picked from commit ec88c1539099b6d4d2c67fa0896d2509b41976f8)
-rw-r--r--tests/end2end/fixtures/quteprocess.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 0c560cf51..7d1cd2394 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -361,6 +361,9 @@ class QuteProc(testprocess.Process):
"Focus object changed: "
"<qutebrowser.browser.webengine.webview.WebEngineView object "
"at *>",
+ # Qt >= 5.11 with workarounds
+ "Focus object changed: "
+ "<PyQt5.QtQuickWidgets.QQuickWidget object at *>",
]
if (log_line.category == 'ipc' and