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 /tests/auto/render/commons | |
| parent | f91ee783c5704b0d55da0d96dacf6eca8933e748 (diff) | |
| parent | 9409dd81287af75108023abbd66e49e07ba65de6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/render/backend/renderer.cpp
Change-Id: I691f54cd6daef8a966df37d447164c94badce34c
Diffstat (limited to 'tests/auto/render/commons')
| -rw-r--r-- | tests/auto/render/commons/testrenderer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h index 031ca214b..20ab032b1 100644 --- a/tests/auto/render/commons/testrenderer.h +++ b/tests/auto/render/commons/testrenderer.h @@ -52,7 +52,7 @@ public: void shutdown() Q_DECL_OVERRIDE {} void releaseGraphicsResources() Q_DECL_OVERRIDE {} void render() Q_DECL_OVERRIDE {} - void doRender() Q_DECL_OVERRIDE {} + void doRender(bool scene3dBlocking = false) Q_DECL_OVERRIDE { Q_UNUSED(scene3dBlocking); } void cleanGraphicsResources() Q_DECL_OVERRIDE {} bool isRunning() const Q_DECL_OVERRIDE { return true; } bool shouldRender() Q_DECL_OVERRIDE { return true; } |