diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-07 13:16:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-09 10:37:30 +0000 |
| commit | 3ccbfd5cfb4864903bddac0fb9481d11c42a9f53 (patch) | |
| tree | 3e4f0852641ec6b2bdda5711de0f78a81c667e4f /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | 6ed125c0073288f46e544b9d415d1f9a9968cb2d (diff) | |
Avoid creating contents adapter on webchannel access
Postpones the setting of webchannels until the content adapter is
created normally. This also simplifies maintaining it over changing
adapters.
Change-Id: I19b861acd3310a7d98c79059911f6ce8c042760b
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 8daf1f988..888828b2f 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -205,6 +205,7 @@ public: qreal devicePixelRatio; QMap<quint64, QJSValue> m_callbacks; QList<QSharedPointer<CertificateErrorController> > m_certificateErrorControllers; + QQmlWebChannel *m_webChannel; private: QScopedPointer<QtWebEngineCore::UIDelegatesManager> m_uIDelegatesManager; |