aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/rendercontrol/window_singlethreaded.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2014-12-16 12:49:08 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-01-07 13:21:00 +0100
commitfae16f9d2fca773276eba150d0414fb2f303d179 (patch)
tree7d657c46028f1e0e0c220414f15a4e01fab425f3 /examples/quick/rendercontrol/window_singlethreaded.cpp
parent5352f67ffa5ee257f2856deb8f5f8cd69108e278 (diff)
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>
Diffstat (limited to 'examples/quick/rendercontrol/window_singlethreaded.cpp')
-rw-r--r--examples/quick/rendercontrol/window_singlethreaded.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/rendercontrol/window_singlethreaded.cpp b/examples/quick/rendercontrol/window_singlethreaded.cpp
index 454b06f425..8ed3f5555c 100644
--- a/examples/quick/rendercontrol/window_singlethreaded.cpp
+++ b/examples/quick/rendercontrol/window_singlethreaded.cpp
@@ -81,7 +81,7 @@ WindowSingleThreaded::WindowSingleThreaded()
m_offscreenSurface->setFormat(m_context->format());
m_offscreenSurface->create();
- m_cubeRenderer = new CubeRenderer;
+ m_cubeRenderer = new CubeRenderer(m_offscreenSurface);
m_renderControl = new QQuickRenderControl(this);
@@ -129,10 +129,10 @@ WindowSingleThreaded::~WindowSingleThreaded()
m_context->doneCurrent();
+ delete m_cubeRenderer;
+
delete m_offscreenSurface;
delete m_context;
-
- delete m_cubeRenderer;
}
void WindowSingleThreaded::createFbo()