Merge "Merge branch 'origin/5.4' into dev" into refs/staging/dev

2 files changed, 11 insertions, 6 deletions

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 6cca36b726..2541359fdd 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -238,6 +238,15 @@ void QQuickWidgetPrivate::renderSceneGraph()
     q->update();
 }
 
+QImage QQuickWidgetPrivate::grabFramebuffer()
+{
+    if (!context)
+        return QImage();
+
+    context->makeCurrent(offscreenSurface);
+    return renderControl->grab();
+}
+
 /*!
     \module QtQuickWidgets
     \title Qt Quick Widgets C++ Classes
@@ -1103,12 +1112,7 @@ QSurfaceFormat QQuickWidget::format() const
  */
 QImage QQuickWidget::grabFramebuffer() const
 {
-    Q_D(const QQuickWidget);
-    if (!d->context)
-        return QImage();
-
-    d->context->makeCurrent(d->offscreenSurface);
-    return d->renderControl->grab();
+    return const_cast<QQuickWidgetPrivate *>(d_func())->grabFramebuffer();
 }
 
 QT_END_NAMESPACE
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h
index 8a8d98f45e..755acb969d 100644
--- a/src/quickwidgets/qquickwidget_p.h
+++ b/src/quickwidgets/qquickwidget_p.h
@@ -89,6 +89,7 @@ public:
     void handleContextCreationFailure(const QSurfaceFormat &format, bool isEs);
 
     GLuint textureId() const Q_DECL_OVERRIDE;
+    QImage grabFramebuffer() Q_DECL_OVERRIDE;
 
     void init(QQmlEngine* e = 0);
     void handleWindowChange();