summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/browser/webview.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-01-16 18:20:32 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-15 17:03:28 +0200
commitbeb4ff332ca5b8406a75e8b2146464c5b0a81abd (patch)
treecb949f8710876153acaa146eda29abf89447a9f4 /examples/webenginewidgets/browser/webview.h
parent84ced937a0f9f2874e32e16c4c6ebf72b46904c9 (diff)
Cleanup the QtWebEngineWidgets public headers and API
Headers were left intact to leave a trace of the evolution compared to the QtWebKit API and to make it easier to work until we had a basic subset of the API implemented. With the upcoming release, this patch removes this convenience in the aim of starting polishing the headers and the documentation for the upcoming release. Change-Id: Iae436b4ec041d771a7002575e122835802bc9f3e Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'examples/webenginewidgets/browser/webview.h')
-rw-r--r--examples/webenginewidgets/browser/webview.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/webenginewidgets/browser/webview.h b/examples/webenginewidgets/browser/webview.h
index 2d3ec50cc..1fb64c8b2 100644
--- a/examples/webenginewidgets/browser/webview.h
+++ b/examples/webenginewidgets/browser/webview.h
@@ -64,14 +64,18 @@ public:
BrowserMainWindow *mainWindow();
protected:
+#if defined(QWEBENGINEPAGE_ACCEPTNAVIGATIONREQUEST)
bool acceptNavigationRequest(QWebEngineFrame *frame, const QNetworkRequest &request, NavigationType type);
+#endif
QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type);
#if !defined(QT_NO_UITOOLS)
QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
#endif
private slots:
+#if defined(QWEBENGINEPAGE_UNSUPPORTEDCONTENT)
void handleUnsupportedContent(QNetworkReply *reply);
+#endif
void authenticationRequired(const QUrl &requestUrl, QAuthenticator *auth);
void proxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost);