From 86e438a0ed10d38a1614c0ae2af039368f6c4fbc Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Wed, 1 Jun 2022 17:50:16 +0200
Subject: [PATCH] QFrameBufferObject::takeTexture also leaks with Qt 5.15

---
 src/nodes/QskPaintedNode.cpp | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/nodes/QskPaintedNode.cpp b/src/nodes/QskPaintedNode.cpp
index 6d09acbb..e153b2bb 100644
--- a/src/nodes/QskPaintedNode.cpp
+++ b/src/nodes/QskPaintedNode.cpp
@@ -18,15 +18,12 @@
 QSK_QT_PRIVATE_BEGIN
 #include <private/qsgplaintexture_p.h>
 #include <private/qquickwindow_p.h>
+#include <private/qopenglframebufferobject_p.h>
 QSK_QT_PRIVATE_END
 
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
-
 #include <qquickopenglutils.h>
-
-QSK_QT_PRIVATE_BEGIN
-#include <private/qopenglframebufferobject_p.h>
-QSK_QT_PRIVATE_END
+#endif
 
 static GLuint qskTakeTexture( QOpenGLFramebufferObject& fbo )
 {
@@ -67,15 +64,6 @@ static GLuint qskTakeTexture( QOpenGLFramebufferObject& fbo )
     return textureId;
 }
 
-#else
-
-static GLuint qskTakeTexture( QOpenGLFramebufferObject& fbo )
-{
-    return fbo.takeTexture();
-}
-
-#endif
-
 namespace
 {
     const quint8 imageRole = 250; // reserved for internal use