diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-22 09:24:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-22 09:24:57 +0100 |
| commit | 520b9823954628f66b256bcf6e0c96f30ed4f625 (patch) | |
| tree | aa8cb07880d8c96b1020bfd8dd43c9dc7bcd8df5 /src/render/frontend/qrenderaspect_p.h | |
| parent | f91ee783c5704b0d55da0d96dacf6eca8933e748 (diff) | |
| parent | 9409dd81287af75108023abbd66e49e07ba65de6 (diff) | |
| download | qt3d-520b9823954628f66b256bcf6e0c96f30ed4f625.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/render/backend/renderer.cpp
Change-Id: I691f54cd6daef8a966df37d447164c94badce34c
Diffstat (limited to 'src/render/frontend/qrenderaspect_p.h')
| -rw-r--r-- | src/render/frontend/qrenderaspect_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h index b8c8538ee..26ca091f6 100644 --- a/src/render/frontend/qrenderaspect_p.h +++ b/src/render/frontend/qrenderaspect_p.h @@ -90,7 +90,7 @@ public: void loadSceneParsers(); void loadRenderPlugin(const QString &pluginName); void renderInitialize(QOpenGLContext *context); - void renderSynchronous(); + void renderSynchronous(bool blocking = false); void renderShutdown(); void registerBackendType(const QMetaObject &, const Qt3DCore::QBackendNodeMapperPtr &functor); QVector<Qt3DCore::QAspectJobPtr> createGeometryRendererJobs(); |