Prevent windows outside the gui thread in rendercontrol example

In the multithreaded case we attempted to create QWindows outside
the gui thread on platforms where QOffscreenSurface is backed by
the hidden QWindow in the absence of a better solution. This has
to be avoided. Therefore, pass a suitable surface from the gui
thread instead.

This will avoid "Attempting to create QWindow-based QOffscreenSurface
outside the gui thread." type of warnings when running on OS X with
--threaded.

Change-Id: Ie3ebeeeaa9e6bdf83e763e40213e2940fbfde667
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/examples/quick/rendercontrol/cuberenderer.h b/examples/quick/rendercontrol/cuberenderer.h
index 8f98376fdf..1d5400ade2 100644
--- a/examples/quick/rendercontrol/cuberenderer.h
+++ b/examples/quick/rendercontrol/cuberenderer.h
@@ -48,11 +48,12 @@ QT_FORWARD_DECLARE_CLASS(QOpenGLShaderProgram)
 QT_FORWARD_DECLARE_CLASS(QOpenGLBuffer)
 QT_FORWARD_DECLARE_CLASS(QOpenGLVertexArrayObject)
 QT_FORWARD_DECLARE_CLASS(QWindow)
+QT_FORWARD_DECLARE_CLASS(QOffscreenSurface)
 
 class CubeRenderer
 {
 public:
-    CubeRenderer();
+    CubeRenderer(QOffscreenSurface *offscreenSurface);
     ~CubeRenderer();
 
     void resize(int w, int h);
@@ -62,6 +63,7 @@ private:
     void init(QWindow *w, QOpenGLContext *share);
     void setupVertexAttribs();
 
+    QOffscreenSurface *m_offscreenSurface;
     QOpenGLContext *m_context;
     QOpenGLShaderProgram *m_program;
     QOpenGLBuffer *m_vbo;