Merge 5.13 into 5.13.2

Change-Id: Ib246d7c44628611a35ca99ea8e5504288c63f4c1

2 files changed, 6 insertions, 0 deletions

diff --git a/src/3rdparty b/src/3rdparty
-Subproject 56c9ec96237de4c7787c643c7ac7ac4e00c9a1d
+Subproject 8c785066d987b663ed7d3386151ec8144c31cdc
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 6373bf2d9..818439e46 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -1051,6 +1051,12 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove()
     auto jsViewPosition = [&view]() {
         QLatin1String script("(function() { return [window.screenX, window.screenY]; })()");
         QVariantList posList = evaluateJavaScriptSync(view.page(), script).toList();
+
+        if (posList.count() != 2) {
+            qWarning("jsViewPosition failed.");
+            return QPoint();
+        }
+
         return QPoint(posList.at(0).toInt(), posList.at(1).toInt());
     };