Temporarily restore a QSGTexturePrivate function

...for source compatibility with other modules, such as Qt Quick 3D.

Once the relevant patches are in in those modules, this can be reverted.
It is harmless otherwise, we simply reintroduce the QSGTexturePrivate
rhiTexture() function that now just calls the public equivalent.

Task-number: QTBUG-82997
Change-Id: I1e102a5f96b06e4dd7108149950eedab2941f4c2
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

2 files changed, 9 insertions, 0 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp
index f7f49f3278..25e02d8058 100644
--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp
+++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp
@@ -749,6 +749,14 @@ QRhiTexture *QSGTexture::rhiTexture() const
     return nullptr;
 }
 
+QRhiTexture *QSGTexturePrivate::rhiTexture() const
+{
+    // Just calls the public API, this private function exists for internal
+    // source compatibility only until all Qt modules migrate away from it.
+    Q_Q(const QSGTexture);
+    return q->rhiTexture();
+}
+
 /*!
     Call this function to enqueue image upload operations to \a
     resourceUpdates, in case there are any pending ones. When there is no new
diff --git a/src/quick/scenegraph/coreapi/qsgtexture_p.h b/src/quick/scenegraph/coreapi/qsgtexture_p.h
index 4a7af7ae4e..e24088229c 100644
--- a/src/quick/scenegraph/coreapi/qsgtexture_p.h
+++ b/src/quick/scenegraph/coreapi/qsgtexture_p.h
@@ -82,6 +82,7 @@ public:
     static QSGTexturePrivate *get(QSGTexture *t) { return t->d_func(); }
     void resetDirtySamplerOptions();
     bool hasDirtySamplerOptions() const;
+    QRhiTexture *rhiTexture() const;
 
     uint wrapChanged : 1;
     uint filteringChanged : 1;