diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-25 14:43:15 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-25 14:44:35 +0000 |
| commit | 0851956b9b5bf17a8be097cdd0161eb708629070 (patch) | |
| tree | 0a307aab7936afa97724d745781a8765875e7c49 /src/render/jobs | |
| parent | 09c344d28017e06af6b34bc3c7b781902d052059 (diff) | |
| parent | e680fe041700296be5e6e4a132e2cfc6f54d4e77 (diff) | |
Merge branch '5.9' into 5.10
Conflicts:
src/render/backend/cameralens.cpp
src/render/backend/cameralens_p.h
src/render/jobs/pickboundingvolumejob.cpp
src/render/jobs/updatelevelofdetailjob.cpp
Change-Id: I5433dde8ace462d11f037742d45f555c87235ffe
Diffstat (limited to 'src/render/jobs')
| -rw-r--r-- | src/render/jobs/loadgeometryjob_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h index 2b0331d1c..c02739647 100644 --- a/src/render/jobs/loadgeometryjob_p.h +++ b/src/render/jobs/loadgeometryjob_p.h @@ -72,7 +72,7 @@ public: void setNodeManagers(NodeManagers *nodeManagers) { m_nodeManagers = nodeManagers; } protected: - void run() Q_DECL_OVERRIDE; + void run() override; HGeometryRenderer m_handle; NodeManagers *m_nodeManagers; }; |