diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2024-03-06 11:20:14 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-06 20:34:29 +0000 |
| commit | a550f746179d4773a6ce2ba05e033afb3c37488b (patch) | |
| tree | e660152ec9fa64ef8dbe19830df83f78003befb8 | |
| parent | 22936a7c0a1fdd5231408455e61941eb10e2148d (diff) | |
QQuickRhiItem: fix access specifiers of overrides
Overrides should not change the access specifier of the original
virtual method, because accessibility of the function should not
change depending on which concrete static type it's called on.
QQuickItem::isTextureProvider() and ::textureProvider() are public,
so the QQuickRhiItem overrides have to be public, too.
Found in API-review.
Change-Id: I4a9d4b8cd479eb8361a5b57e0fdd7ce3fdbbabcd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 95f77de0d45c6fba3465acf7b632e41cf10ed60d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quick/items/qquickrhiitem.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquickrhiitem.h b/src/quick/items/qquickrhiitem.h index 05fc5a8b70..78bfb9fe4b 100644 --- a/src/quick/items/qquickrhiitem.h +++ b/src/quick/items/qquickrhiitem.h @@ -89,6 +89,9 @@ public: QSize effectiveColorBufferSize() const; + bool isTextureProvider() const override; + QSGTextureProvider *textureProvider() const override; + Q_SIGNALS: void sampleCountChanged(); void colorBufferFormatChanged(); @@ -109,8 +112,6 @@ protected: bool event(QEvent *) override; void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override; void releaseResources() override; - bool isTextureProvider() const override; - QSGTextureProvider *textureProvider() const override; private Q_SLOTS: void invalidateSceneGraph(); |