diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-07 15:38:51 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-16 09:59:15 +0200 |
| commit | 3768ec496cb8be1b8bedafd08c19732a405dfeea (patch) | |
| tree | c35780a359ebf600e489c8d4369929d00b308644 /src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture_p.h | |
| parent | bc1b6e73bb31c7eb9b9f6b4920d2e99ac441bc08 (diff) | |
Add argument to QSGTexture::removedFromAtlas()
...as requested by the Qt 6 TODO. To preserve binary (and source)
compatibility in 5.14, the argument was changed into a variable in
QSGTexturePrivate, with a public setter. This can now go away and the
signature of removedFromAtlas() can get updated.
Task-number: QTBUG-82997
Change-Id: I930c0014712c78e140b778b6e9a4d8b92c5bdc8c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture_p.h')
| -rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture_p.h b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture_p.h index aec7dbf976..a2d6d96dfe 100644 --- a/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture_p.h +++ b/src/quick/scenegraph/compressedtexture/qsgcompressedatlastexture_p.h @@ -97,7 +97,7 @@ public: QRectF normalizedTextureSubRect() const override { return m_texture_coords_rect; } - QSGTexture *removedFromAtlas() const override; + QSGTexture *removedFromAtlas(QRhiResourceUpdateBatch *) const override; const QByteArray &data() const { return m_data; } int sizeInBytes() const { return m_dataLength; } |