summaryrefslogtreecommitdiff
path: root/examples/webenginewidgets/simplebrowser/tabwidget.cpp
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-09-04 12:12:51 +0300
committerKari Oikarinen <kari.oikarinen@qt.io>2019-09-04 12:12:51 +0300
commitff1272de6bb44dda30b90c62806d037ca4ef8b77 (patch)
tree8b278bdb97f667ce54e3b36b71e4b6b8c7f49df3 /examples/webenginewidgets/simplebrowser/tabwidget.cpp
parent48c85451adf1d530bccf9bfb542abb3211f0bf36 (diff)
parenta6abc01319798e2175914323273e91927516eba0 (diff)
downloadqtwebengine-ff1272de6bb44dda30b90c62806d037ca4ef8b77.tar.gz
Merge dev into 5.14 (delayed final downmerge)
This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: I89e81a2d285e57eaf29e8cfef4abaf458b352c3b
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/tabwidget.cpp')
-rw-r--r--examples/webenginewidgets/simplebrowser/tabwidget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/webenginewidgets/simplebrowser/tabwidget.cpp b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
index 369bebfd9..3b6d84ebe 100644
--- a/examples/webenginewidgets/simplebrowser/tabwidget.cpp
+++ b/examples/webenginewidgets/simplebrowser/tabwidget.cpp
@@ -200,6 +200,10 @@ void TabWidget::setupView(WebView *webView)
closeTab(index);
});
connect(webView, &WebView::devToolsRequested, this, &TabWidget::devToolsRequested);
+ connect(webPage, &QWebEnginePage::findTextFinished, [this, webView](const QWebEngineFindTextResult &result) {
+ if (currentIndex() == indexOf(webView))
+ emit findTextFinished(result);
+ });
}
WebView *TabWidget::createTab()