diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-09 18:27:15 +0200 |
---|---|---|
committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-12 12:09:29 +0200 |
commit | 4fdbee3bc4526d4a43b798a095e5168633eb99f5 (patch) | |
tree | 11c27e2cba9e383a150838a29c3873a1ed484042 /lib/quick/render_widget_host_view_qt_delegate_quick.cpp | |
parent | 2ee75c4411394981f5bbf50c0edffe42b6343c90 (diff) |
Delay the RWHVDelegate parenting until it's been attached to its RWHV.
This avoids the RWHV being accessed before being attached to
the delegate when attaching the later to the view's layout.
Change-Id: I5fffef60fdd7203cfb4ced807b5475aac676ea09
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/quick/render_widget_host_view_qt_delegate_quick.cpp')
-rw-r--r-- | lib/quick/render_widget_host_view_qt_delegate_quick.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/quick/render_widget_host_view_qt_delegate_quick.cpp b/lib/quick/render_widget_host_view_qt_delegate_quick.cpp index 451d92044..5610beabb 100644 --- a/lib/quick/render_widget_host_view_qt_delegate_quick.cpp +++ b/lib/quick/render_widget_host_view_qt_delegate_quick.cpp @@ -41,6 +41,8 @@ #include "render_widget_host_view_qt_delegate_quick.h" +#include "qquickwebcontentsview_p.h" +#include "qquickwebcontentsview_p_p.h" #include <QQuickWindow> #include <QWindow> @@ -51,6 +53,12 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(QQuickI setAcceptHoverEvents(true); } +void RenderWidgetHostViewQtDelegateQuick::initAsChild(WebContentsAdapterClient* container) +{ + QQuickWebContentsViewPrivate *viewPrivate = static_cast<QQuickWebContentsViewPrivate *>(container); + setParentItem(viewPrivate->q_func()); +} + QRectF RenderWidgetHostViewQtDelegateQuick::screenRect() const { QPointF pos = mapToScene(QPointF(0,0)); |