From 625417c4621d6b4fcf0c40c8128ba39161052f16 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 17 Dec 2020 10:58:04 +0100
Subject: PySide6: Fix building of Qt 3D

Remove QAbstractFrontEndNodeManager, adapting to
qt3d/569d0d030610269a47fe7fec9a3f4248b8d8bdea.

Reject Qt enum helper functions in Qt3D namespaces.

Fixes: PYSIDE-1450
Change-Id: I238010f214a6c59ac6e53dcf02d5c52c1ec51aae
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit c25840f139aeff565808d37cec07cefb60607474)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt        | 1 -
 sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'sources')

diff --git a/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt
index 0e8fb7d40..4ffc9b95a 100644
--- a/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt
+++ b/sources/pyside6/PySide6/Qt3DCore/CMakeLists.txt
@@ -2,7 +2,6 @@ project(Qt3DCore)
 
 set(Qt3DCore_SRC
 ${Qt3DCore_GEN_DIR}/qt3dcore_qabstractaspect_wrapper.cpp
-${Qt3DCore_GEN_DIR}/qt3dcore_qabstractfrontendnodemanager_wrapper.cpp
 ${Qt3DCore_GEN_DIR}/qt3dcore_qabstractfunctor_wrapper.cpp
 ${Qt3DCore_GEN_DIR}/qt3dcore_qabstractskeleton_wrapper.cpp
 ${Qt3DCore_GEN_DIR}/qt3dcore_qarmature_wrapper.cpp
diff --git a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
index 4ebf48295..218726643 100644
--- a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
+++ b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
@@ -45,9 +45,6 @@
     <namespace-type name="Qt3DCore" generate-using="no">
         <enum-type name="ChangeFlag" flags="ChangeFlags"/>
         <object-type name="QAbstractAspect"/>
-        <object-type name="QAbstractFrontEndNodeManager" since="6.0">
-             <enum-type name="DirtyNodeFlag" flags="DirtyNodeSet"/>
-        </object-type>
         <object-type name="QAbstractFunctor" since="6.0"/>
         <object-type name="QAbstractSkeleton" since="5.10"/>
         <object-type name="QArmature" since="5.10"/>
@@ -106,4 +103,7 @@
             <include file-name="Qt3DCore/qtransform.h" location="global"/>
         </object-type>
     </namespace-type>
+
+    <!-- reject Qt enum helper functions in Qt3D namespaces -->
+    <rejection class="^Qt3D.*$" function-name="^qt_getEnum.*$"/>
 </typesystem>
-- 
cgit v1.2.3