diff options
Diffstat (limited to 'src/quickwidgets/qquickwidget_p.h')
| -rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index b01d634fcd..3d64981797 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -87,7 +87,7 @@ public: ~QQuickWidgetPrivate(); void execute(); - void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff) Q_DECL_OVERRIDE; void initResize(); void updateSize(); void updatePosition(); @@ -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 ensureEngine() const; @@ -121,9 +125,12 @@ public: QQuickWindow *offscreenWindow; QOffscreenSurface *offscreenSurface; QQuickRenderControl *renderControl; + +#ifndef QT_NO_OPENGL QOpenGLFramebufferObject *fbo; QOpenGLFramebufferObject *resolvedFbo; QOpenGLContext *context; +#endif QQuickWidget::ResizeMode resizeMode; QSize initialSize; @@ -135,6 +142,10 @@ public: bool fakeHidden; int requestedSamples; + + bool useSoftwareRenderer; + QImage softwareImage; + QRegion updateRegion; }; QT_END_NAMESPACE |