From 9e3423ff9e307065a67fc318d2c6580b6651d12a Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 15 Feb 2018 08:35:34 +0100
Subject: [PATCH] WebPage: Make the loadFinished workaround for all Qt 5.10
 versions

See #2479
---
 autotests/webviewtest.cpp     | 2 +-
 src/lib/webengine/webpage.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autotests/webviewtest.cpp b/autotests/webviewtest.cpp
index 7bb5ce725..a21e6939c 100644
--- a/autotests/webviewtest.cpp
+++ b/autotests/webviewtest.cpp
@@ -82,7 +82,7 @@ void WebViewTest::loadSignalsChangePageTest()
     view.setPage(page2);
 
     // WebPage: Workaround for broken load started/finished signals in QtWebEngine 5.10
-    const int loadFinishedEmitCount = qstrcmp(qVersion(), "5.10.0") == 0 ? 2 : 1;
+    const int loadFinishedEmitCount = qstrncmp(qVersion(), "5.10.", 5) == 0 ? 2 : 1;
 
     QTRY_COMPARE(loadFinishedSpy.count(), loadFinishedEmitCount);
     QCOMPARE(loadStartedSpy.count(), 0);
diff --git a/src/lib/webengine/webpage.cpp b/src/lib/webengine/webpage.cpp
index ace0e0237..c9238b343 100644
--- a/src/lib/webengine/webpage.cpp
+++ b/src/lib/webengine/webpage.cpp
@@ -100,7 +100,7 @@ WebPage::WebPage(QObject* parent)
     });
 
     // Workaround for broken load started/finished signals in QtWebEngine 5.10
-    if (qstrcmp(qVersion(), "5.10.0") == 0) {
+    if (qstrncmp(qVersion(), "5.10.", 5) == 0) {
         connect(this, &QWebEnginePage::loadProgress, this, [this](int progress) {
             if (progress == 100) {
                 emit loadFinished(true);