diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:32:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:35:45 +0100 |
| commit | a077399f4c17f57e911334867c918cc6ddeb15fc (patch) | |
| tree | c8e4d326d7a074e9d16b68399ecc5f728f8533fe /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
| parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) | |
| download | qtwebengine-a077399f4c17f57e911334867c918cc6ddeb15fc.tar.gz | |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index beb5b49bc..dd20c8972 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -143,6 +143,7 @@ public: virtual void focusContainer() Q_DECL_OVERRIDE; virtual void unhandledKeyEvent(QKeyEvent *event) Q_DECL_OVERRIDE; virtual void adoptNewWindow(QtWebEngineCore::WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &) Q_DECL_OVERRIDE; + virtual bool isBeingAdopted() Q_DECL_OVERRIDE; virtual void close() Q_DECL_OVERRIDE; virtual void windowCloseRejected() Q_DECL_OVERRIDE; virtual void requestFullScreenMode(const QUrl &origin, bool fullscreen) Q_DECL_OVERRIDE; @@ -184,6 +185,7 @@ public: void adoptWebContents(QtWebEngineCore::WebContentsAdapter *webContents); void setProfile(QQuickWebEngineProfile *profile); void ensureContentsAdapter(); + void setFullScreenMode(bool); // QQmlListPropertyHelpers static void userScripts_append(QQmlListProperty<QQuickWebEngineScript> *p, QQuickWebEngineScript *script); @@ -205,12 +207,13 @@ public: QUrl explicitUrl; QUrl icon; int loadProgress; - bool m_isFullScreen; + bool m_fullscreenMode; bool isLoading; bool m_activeFocusOnPress; qreal devicePixelRatio; QMap<quint64, QJSValue> m_callbacks; QList<QSharedPointer<CertificateErrorController> > m_certificateErrorControllers; + QQmlWebChannel *m_webChannel; private: QScopedPointer<QtWebEngineCore::UIDelegatesManager> m_uIDelegatesManager; |