From 58c67b08f7ad668f95a6edaccd96dd0fe72f675d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 9 Jul 2021 16:48:00 +0200 Subject: Update parameters to findText callback Change-Id: I622ff55c1c9b6f9d4818228c75543c3deffa37be Reviewed-by: Qt CI Bot Reviewed-by: Peter Varga (cherry picked from commit 56b1f53d9b2927f5ba2a73f85cee59e385bf489d) Reviewed-by: Qt Cherry-pick Bot --- src/core/api/qwebenginepage.cpp | 4 ++-- src/core/api/qwebenginepage.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/api') diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index 9943def62..973826efb 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -1520,12 +1520,12 @@ void QWebEnginePage::replaceMisspelledWord(const QString &replacement) d->adapter->replaceMisspelling(replacement); } -void QWebEnginePage::findText(const QString &subString, FindFlags options, const std::function &resultCallback) +void QWebEnginePage::findText(const QString &subString, FindFlags options, const std::function &resultCallback) { Q_D(QWebEnginePage); if (!d->adapter->isInitialized()) { if (resultCallback) - resultCallback(false); + resultCallback(QWebEngineFindTextResult()); return; } diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 801bcf84d..73b1bfd3a 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -255,7 +255,7 @@ public: bool event(QEvent*) override; - void findText(const QString &subString, FindFlags options = {}, const std::function &resultCallback = std::function()); + void findText(const QString &subString, FindFlags options = {}, const std::function &resultCallback = std::function()); void setFeaturePermission(const QUrl &securityOrigin, Feature feature, PermissionPolicy policy); -- cgit v1.2.3