diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-24 14:44:11 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-24 16:12:14 +0000 |
| commit | 4412d22c26ba4a187837b0565c66e5b51de85b3c (patch) | |
| tree | 2094cf0f3dd605e80cdd1bbf06e7717e0e325445 /src/quickwidgets/qquickwidget_p.h | |
| parent | a88fb838854daabe175440c010fcc99a094939c3 (diff) | |
Enable QQuickWidget for no-OpenGL builds
Enables and fixes QQuickWidget so it compiles in no-opengl builds.
Change-Id: Ib50dec1d1429ec1140257dd6dcd9784126e61852
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quickwidgets/qquickwidget_p.h')
| -rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index 5c35093c58..9e66087295 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -101,8 +101,12 @@ public: QObject *focusObject() Q_DECL_OVERRIDE; +#ifndef QT_NO_OPENGL GLuint textureId() const Q_DECL_OVERRIDE; QImage grabFramebuffer() Q_DECL_OVERRIDE; +#else + QImage grabFramebuffer(); +#endif void init(QQmlEngine* e = 0); void handleWindowChange(); @@ -120,9 +124,12 @@ public: QQuickWindow *offscreenWindow; QOffscreenSurface *offscreenSurface; QQuickRenderControl *renderControl; + +#ifndef QT_NO_OPENGL QOpenGLFramebufferObject *fbo; QOpenGLFramebufferObject *resolvedFbo; QOpenGLContext *context; +#endif QQuickWidget::ResizeMode resizeMode; QSize initialSize; |