diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:14:57 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:15:32 +0100 |
| commit | 1776037b0443dc57d59afe0772a83b1d47aced14 (patch) | |
| tree | 56213eee7188e5f1d2e4abe290b3757603c835ef /src/render/materialsystem/qshaderprogrambuilder.h | |
| parent | c2ea752f684290d156c500c6a7174fe3f27fa086 (diff) | |
| parent | c754eb2883394852f155e31f5366fa25a4ffad42 (diff) | |
Merge branch '5.15' into dev
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
Diffstat (limited to 'src/render/materialsystem/qshaderprogrambuilder.h')
| -rw-r--r-- | src/render/materialsystem/qshaderprogrambuilder.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h index 5dc6b54ff..48e189c8c 100644 --- a/src/render/materialsystem/qshaderprogrambuilder.h +++ b/src/render/materialsystem/qshaderprogrambuilder.h @@ -117,6 +117,8 @@ Q_SIGNALS: protected: explicit QShaderProgramBuilder(QShaderProgramBuilderPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: Q_DECLARE_PRIVATE(QShaderProgramBuilder) |