diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-07-09 15:48:06 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-08-02 10:28:39 +0200 |
| commit | 4ffc07ddb8739da9e94a2b23b03c63fd7b74c09a (patch) | |
| tree | a036834ea7a1e1bbf9327d3c9fc366105326a1fc /src | |
| parent | abba8dd0f2d94e67e211aaab7c91d63c07e8497c (diff) | |
Switch to the public QOpenGLWidget API
Change-Id: I5554e43b8703864111f37f8b684a47669107512e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp | 12 | ||||
| -rw-r--r-- | src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp index f4c2b2a13..33ef3a3c0 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp @@ -61,6 +61,14 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende , m_isPopup(false) { setFocusPolicy(Qt::StrongFocus); + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) + QSurfaceFormat format; + format.setDepthBufferSize(24); + format.setStencilBufferSize(8); + setFormat(format); +#endif + setMouseTracking(true); setAttribute(Qt::WA_AcceptTouchEvents); setAttribute(Qt::WA_OpaquePaintEvent); @@ -140,7 +148,11 @@ QWindow* RenderWidgetHostViewQtDelegateWidget::window() const void RenderWidgetHostViewQtDelegateWidget::update() { +#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0)) updateGL(); +#else + QOpenGLWidget::update(); +#endif } void RenderWidgetHostViewQtDelegateWidget::updateCursor(const QCursor &cursor) diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h index f05ca2005..03827adfe 100644 --- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h +++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h @@ -45,7 +45,11 @@ #include "render_widget_host_view_qt_delegate.h" #include "web_contents_adapter_client.h" -#include <private/qopenglwidget_p.h> +#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0)) +#include <QtWidgets/private/qopenglwidget_p.h> +#else +#include <QtWidgets/QOpenGLWidget> +#endif QT_BEGIN_NAMESPACE class QSGContext; |