summaryrefslogtreecommitdiff
path: root/lib/quick
diff options
context:
space:
mode:
Diffstat (limited to 'lib/quick')
-rw-r--r--lib/quick/qquickwebengineview.cpp10
-rw-r--r--lib/quick/qquickwebengineview_p_p.h1
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/quick/qquickwebengineview.cpp b/lib/quick/qquickwebengineview.cpp
index 80ddc287f..fa68660ae 100644
--- a/lib/quick/qquickwebengineview.cpp
+++ b/lib/quick/qquickwebengineview.cpp
@@ -49,8 +49,9 @@
QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
- : adapter(new WebContentsAdapter(this))
+ : adapter(new WebContentsAdapter)
{
+ adapter->initialize(this);
}
RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate()
@@ -97,6 +98,13 @@ void QQuickWebEngineViewPrivate::focusContainer()
q->forceActiveFocus();
}
+void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition)
+{
+ Q_UNUSED(newWebContents);
+ Q_UNUSED(disposition);
+ Q_UNREACHABLE();
+}
+
QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent)
: QQuickItem(*(new QQuickWebEngineViewPrivate), parent)
{
diff --git a/lib/quick/qquickwebengineview_p_p.h b/lib/quick/qquickwebengineview_p_p.h
index 3d74f60de..f2475954d 100644
--- a/lib/quick/qquickwebengineview_p_p.h
+++ b/lib/quick/qquickwebengineview_p_p.h
@@ -64,6 +64,7 @@ public:
virtual QRectF viewportRect() const Q_DECL_OVERRIDE;
virtual void loadFinished(bool success) Q_DECL_OVERRIDE;
virtual void focusContainer() Q_DECL_OVERRIDE;
+ virtual void adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition) Q_DECL_OVERRIDE;
QExplicitlySharedDataPointer<WebContentsAdapter> adapter;
friend class RenderWidgetHostViewQtDelegateQuick;