diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-23 14:20:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-23 14:20:07 +0200 |
| commit | dffe673c3044a6351aa72b69a5bf60429259c08c (patch) | |
| tree | e0feba0056896b981a287704b2ef7383f9b95266 /src/webenginewidgets/api/qwebenginepage.h | |
| parent | 9be23eb946580519b2b0600cc854ec8050b90659 (diff) | |
| parent | 8f32ce028a48ddc6a7333b7af635424c78437ed7 (diff) | |
| download | qtwebengine-dffe673c3044a6351aa72b69a5bf60429259c08c.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I5d0d5f65575256673c35558e0fcbf749a1439793
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index a5930b396..9740c89c9 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -37,9 +37,9 @@ #ifndef QWEBENGINEPAGE_H #define QWEBENGINEPAGE_H -#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> -#include <QtWebEngineWidgets/qwebenginecertificateerror.h> -#include <QtWebEngineCore/qwebenginecallback.h> +#include <qtwebenginewidgetsglobal.h> +#include <qwebenginecertificateerror.h> +#include <qwebenginecallback.h> #include <QtCore/qobject.h> #include <QtCore/qurl.h> @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE class QMenu; class QWebChannel; +class QWebEngineFullScreenRequest; class QWebEngineHistory; class QWebEnginePage; class QWebEnginePagePrivate; @@ -252,12 +253,12 @@ Q_SIGNALS: void linkHovered(const QString &url); void selectionChanged(); - void fullScreenRequested(bool fullScreen); void geometryChangeRequested(const QRect& geom); void windowCloseRequested(); void featurePermissionRequested(const QUrl &securityOrigin, QWebEnginePage::Feature feature); void featurePermissionRequestCanceled(const QUrl &securityOrigin, QWebEnginePage::Feature feature); + void fullScreenRequested(const QWebEngineFullScreenRequest &fullScreenRequest); void authenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator); void proxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator, const QString &proxyHost); @@ -282,7 +283,7 @@ protected: virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID); virtual bool certificateError(const QWebEngineCertificateError &certificateError); virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame); - virtual bool isFullScreen(); + private: Q_DISABLE_COPY(QWebEnginePage) Q_DECLARE_PRIVATE(QWebEnginePage) |