diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-05-09 08:42:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-09 09:09:28 +0000 |
| commit | c5ff1f7f159b4dfa0fc2803df9866eab18339eaa (patch) | |
| tree | 414037b99d63dbcc405db046594e900076ef4c2e /src/render/jobs/job_common_p.h | |
| parent | 5679b23c5338ae41d12755cf4e26a95bc391d0a9 (diff) | |
| parent | e9642824244fa9fe55dca2cef8e002192a4f1b17 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/render/backend/abstractrenderer_p.h
src/render/renderers/opengl/renderer/renderer.cpp
tests/auto/render/renderer/tst_renderer.cpp
Change-Id: Ib6da858f10bec57bdb1002bd8fa4172304d118f2
Diffstat (limited to 'src/render/jobs/job_common_p.h')
| -rw-r--r-- | src/render/jobs/job_common_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/jobs/job_common_p.h b/src/render/jobs/job_common_p.h index 9c83624b8..5fe16f933 100644 --- a/src/render/jobs/job_common_p.h +++ b/src/render/jobs/job_common_p.h @@ -109,6 +109,7 @@ namespace JobTypes { UpdateLayerEntity, SendTextureChangesToFrontend, SendSetFenceHandlesToFrontend, + UpdateEntityHierarchy, }; } // JobTypes |