diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:40:51 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:41:00 +0100 |
| commit | a5947906d3aac7ec2f21a9621f7ad67a761a4560 (patch) | |
| tree | b67a28ecfdf01a0ca71ec51e00ee45ee1491eeaf /src/plugins/qt7/qt7movieviewrenderer.h | |
| parent | 962e99534d8955ae6c3c3524c5005f518b4e01bc (diff) | |
| parent | 79f585b9e90c311f2c7b905426318d345b1bf641 (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs
Change-Id: Idb607da32f80784d94556443be6740c6d7223411
Diffstat (limited to 'src/plugins/qt7/qt7movieviewrenderer.h')
| -rw-r--r-- | src/plugins/qt7/qt7movieviewrenderer.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/qt7/qt7movieviewrenderer.h b/src/plugins/qt7/qt7movieviewrenderer.h index ade492948..00b658b30 100644 --- a/src/plugins/qt7/qt7movieviewrenderer.h +++ b/src/plugins/qt7/qt7movieviewrenderer.h @@ -61,6 +61,8 @@ class QT7PlayerSession; class QT7PlayerService; class QGLWidget; class QGLFramebufferObject; +class QWindow; +class QOpenGLContext; class QT7MovieViewRenderer : public QT7VideoRendererControl { @@ -88,7 +90,8 @@ private: QSize m_nativeSize; QAbstractVideoSurface *m_surface; QVideoFrame m_currentFrame; - QGLWidget *m_glWidget; + QWindow *m_window; + QOpenGLContext *m_context; QGLFramebufferObject *m_fbo; CIContext *m_ciContext; |