diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-07 15:20:58 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-16 09:59:09 +0200 |
commit | 76f783c23fa2fd11c5cef6031f59ad5a1a6c7545 (patch) | |
tree | 97eef491e96087bb6d0fffecfda8ce8e59df9117 /src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h | |
parent | 136058c794c69266e5c4f7ec4f042ef193aaa304 (diff) |
Make comparisonKey() a pure virtual in QSGTexture
In Qt 5.14 this was a virtual in QSGTexturePrivate due to having had
to maintain binary compatibility. In 6.0 it becomes a pure virtual in
QSGTexture.
Task-number: QTBUG-82997
Change-Id: I26a42169b071fe8d413f5c89ef45850fa7222006
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h')
-rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h b/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h index b858d8ddee..084205c5b5 100644 --- a/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h +++ b/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h @@ -73,6 +73,7 @@ public: bool hasAlphaChannel() const override; bool hasMipmaps() const override; + int comparisonKey() const override; int textureId() const override; void bind() override; @@ -97,7 +98,6 @@ class QSGCompressedTexturePrivate : public QSGTexturePrivate { Q_DECLARE_PUBLIC(QSGCompressedTexture) public: - int comparisonKey() const override; QRhiTexture *rhiTexture() const override; void updateRhiTexture(QRhi *rhi, QRhiResourceUpdateBatch *resourceUpdates) override; }; |