summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2017-09-11 22:43:56 +0100
committerMike Krus <mike.krus@kdab.com>2017-09-12 08:23:07 +0000
commitbf5fd7a78c91e29332ce70ad844b756150f32f18 (patch)
treed6145d81826ac2e7a8ac8a46df2d15ec48c70293
parentd88f9796150b8bc3b1506d2bca450c0840bf3807 (diff)
Fix crash on surface selector unit test
Change order of local variables affecting the destructions order and making sure window outlives the surface selector Change-Id: Ia04f110656f4cc563643fb056ae491ffadf3a8b4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
index 1e003e6b8..982a58b2b 100644
--- a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
+++ b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp
@@ -188,8 +188,8 @@ private Q_SLOTS:
void checkCreationData()
{
// GIVEN
- Qt3DRender::QRenderSurfaceSelector renderSurfaceSelector;
QWindow newValue;
+ Qt3DRender::QRenderSurfaceSelector renderSurfaceSelector;
renderSurfaceSelector.setSurface(&newValue);
renderSurfaceSelector.setExternalRenderTargetSize(QSize(128, 128));
@@ -250,10 +250,10 @@ private Q_SLOTS:
void checkSurfaceUpdate()
{
// GIVEN
+ QWindow newWindow;
TestArbiter arbiter;
Qt3DRender::QRenderSurfaceSelector renderSurfaceSelector;
arbiter.setArbiterOnNode(&renderSurfaceSelector);
- QWindow newWindow;
{
// WHEN