diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-11-23 09:06:01 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2021-01-11 11:48:21 +0000 |
| commit | 8a6b7a377d7cada0f4d98b35d2ac28f7e70aff83 (patch) | |
| tree | edceb036960770772b50feb9fe64959d8583d69f /src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h | |
| parent | ac9c708d7a34e66922056e5bca84b3cf583d61eb (diff) | |
Update QtQuick API to build with 5.15
Haven't tried to run anything, it just builds
Change-Id: I6c2c2a949bc3892a363697cf38f1608af87c303c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h')
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h index c4b483625..942ffba39 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h @@ -65,8 +65,12 @@ public: protected: // QSGMaterialShader interface +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool updateUniformData(RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) final; void updateSampledImage(RenderState &state, int binding, QSGTexture **texture, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) final; +#else + char const *const *attributeNames() const final; +#endif }; } // namespace Qt3DRender |