From 5e0d795dfd34fbf3b2325b2a9c9f435154bd8bc7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 2 Mar 2021 19:18:16 +0100
Subject: Fix QtStateMachine/QtScxml to build

- Remove QScxmlEcmaScriptDataModel, adapting to
  9251d5c76fb57674e8b7d3491f064814c5e08b20 .
- Change the event classes to object types, fixing
  missing copy constructor after
  5fcbb17760d9ddf0a1e39c40baeaf28df9a4bb5e .

Task-number: PYSIDE-1482
Task-number: QTBUG-89831
Change-Id: Icc5cd216bd962f7d67bc60d8de08fafd580a1e22
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 sources/pyside6/PySide6/QtScxml/CMakeLists.txt                     | 1 -
 sources/pyside6/PySide6/QtScxml/typesystem_scxml.xml               | 1 -
 sources/pyside6/PySide6/QtStateMachine/typesystem_statemachine.xml | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'sources')

diff --git a/sources/pyside6/PySide6/QtScxml/CMakeLists.txt b/sources/pyside6/PySide6/QtScxml/CMakeLists.txt
index 8cb78c9ee..332ae9848 100644
--- a/sources/pyside6/PySide6/QtScxml/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtScxml/CMakeLists.txt
@@ -29,7 +29,6 @@ if (Qt${QT_MAJOR_VERSION}Scxml_VERSION VERSION_EQUAL 5.12.0
     list(APPEND QtScxml_SRC
          ${QtScxml_GEN_DIR}/qscxmldatamodel_wrapper.cpp
          ${QtScxml_GEN_DIR}/qscxmldatamodel_foreachloopbody_wrapper.cpp
-         ${QtScxml_GEN_DIR}/qscxmlecmascriptdatamodel_wrapper.cpp
          ${QtScxml_GEN_DIR}/qscxmlcppdatamodel_wrapper.cpp
          ${QtScxml_GEN_DIR}/qscxmlnulldatamodel_wrapper.cpp)
 endif()
diff --git a/sources/pyside6/PySide6/QtScxml/typesystem_scxml.xml b/sources/pyside6/PySide6/QtScxml/typesystem_scxml.xml
index faac34e66..46d30b1b6 100644
--- a/sources/pyside6/PySide6/QtScxml/typesystem_scxml.xml
+++ b/sources/pyside6/PySide6/QtScxml/typesystem_scxml.xml
@@ -73,7 +73,6 @@
             </inject-code>
         </modify-function>
     </object-type>
-    <object-type name="QScxmlEcmaScriptDataModel" since="5.12"/>
     <value-type name="QScxmlError"/>
     <namespace-type name="QScxmlExecutableContent">
         <value-type name="AssignmentInfo"/>
diff --git a/sources/pyside6/PySide6/QtStateMachine/typesystem_statemachine.xml b/sources/pyside6/PySide6/QtStateMachine/typesystem_statemachine.xml
index 561916d27..a14c740d7 100644
--- a/sources/pyside6/PySide6/QtStateMachine/typesystem_statemachine.xml
+++ b/sources/pyside6/PySide6/QtStateMachine/typesystem_statemachine.xml
@@ -193,8 +193,8 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
     <enum-type name="Error"/>
     <enum-type name="EventPriority"/>
 
-    <value-type name="SignalEvent"/>
-    <value-type name="WrappedEvent"/>
+    <object-type name="SignalEvent"/>
+    <object-type name="WrappedEvent"/>
 
     <modify-function signature="addState(QAbstractState*)">
       <modify-argument index="1">
-- 
cgit v1.2.3