From d7f0447c0a3f230f2cddd544f464004ebfcf433b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 28 Jun 2021 08:48:29 +0200
Subject: PySide6: Add missing API of QQuickFramebufferObject.Renderer

The virtuals taking and returning a QOpenGLFramebufferObject were
missing since QOpenGLFramebufferObject was moved from Qt Gui
to Qt OpenGL. Add the dependency to fix this.

Fixes: PYSIDE-1611
Change-Id: Idfc234ce79b0619d5c2d8a8901f43733e210eafd
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit fc916c509263ac13083a8e00a8afc9d930ed0dd1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 sources/pyside6/PySide6/QtQuick/CMakeLists.txt          | 5 ++++-
 sources/pyside6/PySide6/QtQuick/typesystem_quick.xml    | 3 ++-
 sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt | 5 ++++-
 sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt   | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt
index d3682a8d8..355513bd6 100644
--- a/sources/pyside6/PySide6/QtQuick/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuick/CMakeLists.txt
@@ -62,12 +62,14 @@ set(QtQuick_include_dirs  ${QtQuick_SOURCE_DIR}
                           ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Core_PRIVATE_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS}
+                          ${Qt${QT_MAJOR_VERSION}OpenGL_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Qml_PRIVATE_INCLUDE_DIRS}
                           ${Qt${QT_MAJOR_VERSION}Quick_INCLUDE_DIRS}
                           ${libpyside_SOURCE_DIR}
                           ${QtGui_GEN_DIR}
+                          ${QtOpenGL_GEN_DIR}
                           ${QtCore_GEN_DIR}
                           ${QtNetwork_GEN_DIR}
                           ${QtQml_GEN_DIR}
@@ -76,11 +78,12 @@ set(QtQuick_include_dirs  ${QtQuick_SOURCE_DIR}
 set(QtQuick_libraries pyside6
                       ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
+                      ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES})
 
-set(QtQuick_deps QtGui QtNetwork QtQml)
+set(QtQuick_deps QtGui QtOpenGL QtNetwork QtQml)
 
 create_pyside_module(NAME QtQuick
                      INCLUDE_DIRS QtQuick_include_dirs
diff --git a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml
index ee0b6a4ec..04d3be885 100644
--- a/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml
+++ b/sources/pyside6/PySide6/QtQuick/typesystem_quick.xml
@@ -42,7 +42,8 @@
 <typesystem package="PySide6.QtQuick">
     <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
     <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
-    <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
+    <!-- QQuickFramebufferObject::Renderer needs QOpenGLFramebufferObject -->
+    <load-typesystem name="QtOpenGL/typesystem_opengl.xml" generate="no"/>
     <load-typesystem name="QtQml/typesystem_qml.xml" generate="no"/>
 
     <smart-pointer-type name="QSharedPointer" type="shared" getter="data"/>
diff --git a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt
index 9e4befffd..d5f35050d 100644
--- a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt
@@ -11,12 +11,14 @@ set(QtQuickControls2_include_dirs ${QtQuickControls2_SOURCE_DIR}
                                   ${QtQml_SOURCE_DIR}
                                   ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                                   ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS}
+                                  ${Qt${QT_MAJOR_VERSION}OpenGL_INCLUDE_DIRS}
                                   ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS}
                                   ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS}
                                   ${Qt${QT_MAJOR_VERSION}Quick_INCLUDE_DIRS}
                                   ${Qt${QT_MAJOR_VERSION}QuickControls2_INCLUDE_DIRS}
                                   ${libpyside_SOURCE_DIR}
                                   ${QtGui_GEN_DIR}
+                                  ${QtOpenGL_GEN_DIR}
                                   ${QtCore_GEN_DIR}
                                   ${QtNetwork_GEN_DIR}
                                   ${QtQml_GEN_DIR}
@@ -26,12 +28,13 @@ set(QtQuickControls2_include_dirs ${QtQuickControls2_SOURCE_DIR}
 set(QtQuickControls2_libraries pyside6
                       ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
+                      ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}QuickControls2_LIBRARIES})
 
-set(QtQuickControls2_deps QtGui QtNetwork QtQml QtQuick)
+set(QtQuickControls2_deps QtGui QtOpenGL QtNetwork QtQml QtQuick)
 
 create_pyside_module(NAME QtQuickControls2
                      INCLUDE_DIRS QtQuickControls2_include_dirs
diff --git a/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt
index 3c5ba52c3..0c6f18bad 100644
--- a/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtQuickWidgets/CMakeLists.txt
@@ -10,6 +10,7 @@ set(QtQuickWidgets_include_dirs  ${QtQuickWidgets_SOURCE_DIR}
                                  ${QtQml_SOURCE_DIR}
                                  ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
                                  ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS}
+                                 ${Qt${QT_MAJOR_VERSION}OpenGL_INCLUDE_DIRS}
                                  ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS}
                                  ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS}
                                  ${Qt${QT_MAJOR_VERSION}Quick_INCLUDE_DIRS}
@@ -17,6 +18,7 @@ set(QtQuickWidgets_include_dirs  ${QtQuickWidgets_SOURCE_DIR}
                                  ${Qt${QT_MAJOR_VERSION}QuickWidgets_INCLUDE_DIRS}
                                  ${libpyside_SOURCE_DIR}
                                  ${QtGui_GEN_DIR}
+                                 ${QtOpenGL_GEN_DIR}
                                  ${QtCore_GEN_DIR}
                                  ${QtWidgets_GEN_DIR}
                                  ${QtNetwork_GEN_DIR}
@@ -27,13 +29,14 @@ set(QtQuickWidgets_include_dirs  ${QtQuickWidgets_SOURCE_DIR}
 set(QtQuickWidgets_libraries pyside6
                              ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
                              ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
+                             ${Qt${QT_MAJOR_VERSION}OpenGL_LIBRARIES}
                              ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES}
                              ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
                              ${Qt${QT_MAJOR_VERSION}Quick_LIBRARIES}
                              ${Qt${QT_MAJOR_VERSION}Qml_LIBRARIES}
                              ${Qt${QT_MAJOR_VERSION}QuickWidgets_LIBRARIES})
 
-set(QtQuickWidgets_deps QtGui QtQml QtQuick QtWidgets QtNetwork)
+set(QtQuickWidgets_deps QtGui QtOpenGL QtQml QtQuick QtWidgets QtNetwork)
 
 create_pyside_module(NAME QtQuickWidgets
                      INCLUDE_DIRS QtQuickWidgets_include_dirs
-- 
cgit v1.2.3