From 634625246cd3057f2404208abbd0d05459239a06 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 31 Oct 2022 21:50:46 +0100
Subject: PySide6: Disambiguate Qt3D headers

Specify include paths with module for the headers that exist in qtbase
as well.

Pick-to: 6.4 6.2
Task-number: PYSIDE-2099
Change-Id: I470c38dc3e47d752348cf7cb41b3849b20ca8c73
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml | 7 ++++++-
 sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml           | 2 ++
 sources/pyside6/PySide6/Qt3DInput/typesystem_3dinput.xml         | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml
index d287c3db9..f93a51b59 100644
--- a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml
+++ b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml
@@ -9,6 +9,8 @@
     <namespace-type name="Qt3DAnimation">
         <object-type name="QAbstractAnimation">
             <enum-type name="AnimationType"/>
+            <!-- Disambiguate from QtCore/qabstractanimation.h -->
+            <include file-name="Qt3DAnimation/qabstractanimation.h" location="global"/>
         </object-type>
         <object-type name="QAbstractAnimationClip"/>
         <value-type name="QAnimationClipData" since="6.1"/>
@@ -27,7 +29,10 @@
             <enum-type name="Status"/>
         </object-type>
         <object-type name="QAnimationController"/>
-        <object-type name="QAnimationGroup"/>
+        <object-type name="QAnimationGroup">
+            <!-- Disambiguate from QtCore/qanimationgroup.h -->
+            <include file-name="Qt3DAnimation/qanimationgroup.h" location="global"/>
+        </object-type>
         <object-type name="QBlendedClipAnimator"/>
         <value-type name="QChannel"/>
         <value-type name="QChannelComponent"/>
diff --git a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
index b49a57e9c..aac46755a 100644
--- a/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
+++ b/sources/pyside6/PySide6/Qt3DCore/typesystem_3dcore.xml
@@ -35,6 +35,8 @@
         <object-type name="QBuffer" since="6.0">
             <enum-type name="AccessType"/>
             <enum-type name="UsageType"/>
+            <!-- Disambiguate from QtCore/qbuffer.h -->
+            <include file-name="Qt3DCore/qbuffer.h" location="global"/>
         </object-type>
         <object-type name="QComponent"/>
         <object-type name="QEntity">
diff --git a/sources/pyside6/PySide6/Qt3DInput/typesystem_3dinput.xml b/sources/pyside6/PySide6/Qt3DInput/typesystem_3dinput.xml
index 271b24b1e..96160aeef 100644
--- a/sources/pyside6/PySide6/Qt3DInput/typesystem_3dinput.xml
+++ b/sources/pyside6/PySide6/Qt3DInput/typesystem_3dinput.xml
@@ -10,7 +10,10 @@
         <object-type name="QAbstractActionInput"/>
         <object-type name="QAbstractAxisInput"/>
         <object-type name="QAbstractPhysicalDevice"/>
-        <object-type name="QAction"/>
+        <object-type name="QAction">
+            <!-- Disambiguate from QtGui/qaction.h -->
+            <include file-name="Qt3DInput/qaction.h" location="global"/>
+        </object-type>
         <object-type name="QActionInput"/>
         <object-type name="QAnalogAxisInput"/>
         <object-type name="QAxis"/>
-- 
cgit v1.2.3