diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-15 16:50:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 14:53:15 +0100 |
| commit | a867d7673b9770fafa42907fffb5886d5f8d4c9c (patch) | |
| tree | f90601ab2db8337aa8f0c7870d3e582c3f543ed8 /lib/quick/qquickwebengineview.cpp | |
| parent | ec7b2ee70a8b2db7fb87f50671a001ddd54697b0 (diff) | |
Add a WebEngine.experimental QtQuick plugin library.
Bring this QtWebKit concept to our API as well to contain APIs that
we aren't comfortable adding to the supported-forever group yet and
allow trying them out unofficially for an undetermined number of
releases first.
Change-Id: I52c8655dfd2996ea461ac6c00de975002827a4c3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/quick/qquickwebengineview.cpp')
| -rw-r--r-- | lib/quick/qquickwebengineview.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/quick/qquickwebengineview.cpp b/lib/quick/qquickwebengineview.cpp index 970033a22..4cfff0102 100644 --- a/lib/quick/qquickwebengineview.cpp +++ b/lib/quick/qquickwebengineview.cpp @@ -51,12 +51,18 @@ QT_BEGIN_NAMESPACE QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() : adapter(new WebContentsAdapter(qApp->property("QQuickWebEngineView_DisableHardwareAcceleration").toBool() ? SoftwareRenderingMode : HardwareAccelerationMode)) + , e(new QQuickWebEngineViewExperimental(this)) , loadProgress(0) , inspectable(false) { adapter->initialize(this); } +QQuickWebEngineViewExperimental *QQuickWebEngineViewPrivate::experimental() const +{ + return e; +} + RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, RenderingMode mode) { #if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)) @@ -134,6 +140,8 @@ void QQuickWebEngineViewPrivate::close() QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent) : QQuickItem(*(new QQuickWebEngineViewPrivate), parent) { + Q_D(const QQuickWebEngineView); + d->e->q_ptr = this; } QQuickWebEngineView::~QQuickWebEngineView() @@ -239,4 +247,10 @@ void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRect } } +QQuickWebEngineViewExperimental::QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate *viewPrivate) + : q_ptr(0) + , d_ptr(viewPrivate) +{ +} + QT_END_NAMESPACE |