diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-12-11 16:06:21 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-12-14 10:21:59 +0000 |
| commit | 4275a32db9ceb810dfac838df9f07b9c5c1eb7a6 (patch) | |
| tree | 8b8e6339924471a4a88dc2680d3f2accd3ac8d03 /src/Viewer/qmlviewer/Qt3DSView.cpp | |
| parent | 165f46660a422e65372856da6200fbc36e76151d (diff) | |
Ensure qml stream proxy gets created in main thread1.0
Otherwise this will crash when trying to view presentations with
qml streams in them when no sub-presentation settings have been set.
Change-Id: I490eacc0669a4c68eef1c4d00de7da8593c353f7
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Viewer/qmlviewer/Qt3DSView.cpp')
| -rw-r--r-- | src/Viewer/qmlviewer/Qt3DSView.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Viewer/qmlviewer/Qt3DSView.cpp b/src/Viewer/qmlviewer/Qt3DSView.cpp index 9603aefc..f24cc41d 100644 --- a/src/Viewer/qmlviewer/Qt3DSView.cpp +++ b/src/Viewer/qmlviewer/Qt3DSView.cpp @@ -129,6 +129,9 @@ void Q3DSView::componentComplete() m_viewerSettings->d_ptr->setCommandQueue(&m_pendingCommands); m_presentation->d_ptr->setCommandQueue(&m_pendingCommands); + // Ensure qml stream proxy gets created on main thread + m_presentation->d_ptr->streamProxy(); + QQuickFramebufferObject::componentComplete(); } |