From 8ad3a73590029d8284bae1e81a169dbc21c723aa Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Thu, 18 Aug 2022 10:40:02 +0200 Subject: Fix simplebrowser build with Qt 6.3 Pick-to: 6.4 Task-number: QTBUG-97829 Change-Id: I0034a1350bf1a0bf01914f0216dd37859e3e7163 Reviewed-by: Allan Sandfeld Jensen --- examples/webenginewidgets/simplebrowser/webview.cpp | 6 ++++++ examples/webenginewidgets/simplebrowser/webview.h | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'examples/webenginewidgets/simplebrowser') diff --git a/examples/webenginewidgets/simplebrowser/webview.cpp b/examples/webenginewidgets/simplebrowser/webview.cpp index f882db670..16a58ce6c 100644 --- a/examples/webenginewidgets/simplebrowser/webview.cpp +++ b/examples/webenginewidgets/simplebrowser/webview.cpp @@ -97,8 +97,10 @@ void WebView::setPage(WebPage *page) &WebView::handleProxyAuthenticationRequired); disconnect(oldPage, &QWebEnginePage::registerProtocolHandlerRequested, this, &WebView::handleRegisterProtocolHandlerRequested); +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) disconnect(oldPage, &QWebEnginePage::fileSystemAccessRequested, this, &WebView::handleFileSystemAccessRequested); +#endif } createWebActionTrigger(page,QWebEnginePage::Forward); createWebActionTrigger(page,QWebEnginePage::Back); @@ -114,8 +116,10 @@ void WebView::setPage(WebPage *page) &WebView::handleProxyAuthenticationRequired); connect(page, &QWebEnginePage::registerProtocolHandlerRequested, this, &WebView::handleRegisterProtocolHandlerRequested); +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) connect(page, &QWebEnginePage::fileSystemAccessRequested, this, &WebView::handleFileSystemAccessRequested); +#endif } int WebView::loadProgress() const @@ -305,6 +309,7 @@ void WebView::handleRegisterProtocolHandlerRequested( } //! [registerProtocolHandlerRequested] +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) void WebView::handleFileSystemAccessRequested(QWebEngineFileSystemAccessRequest request) { QString accessType; @@ -332,3 +337,4 @@ void WebView::handleFileSystemAccessRequested(QWebEngineFileSystemAccessRequest else request.reject(); } +#endif // QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) diff --git a/examples/webenginewidgets/simplebrowser/webview.h b/examples/webenginewidgets/simplebrowser/webview.h index 1ba2e74df..63f82c3c9 100644 --- a/examples/webenginewidgets/simplebrowser/webview.h +++ b/examples/webenginewidgets/simplebrowser/webview.h @@ -7,7 +7,9 @@ #include #include #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) #include +#endif #include #include @@ -41,7 +43,9 @@ private slots: void handleProxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost); void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request); +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) void handleFileSystemAccessRequested(QWebEngineFileSystemAccessRequest request); +#endif private: void createWebActionTrigger(QWebEnginePage *page, QWebEnginePage::WebAction); -- cgit v1.2.3