aboutsummaryrefslogtreecommitdiffstats
path: root/sources
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-01 12:30:27 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-01 12:56:13 +0100
commit25b06b8df797b3edb88f9d6054f8a7e9e77a280d (patch)
tree6d6fa60e2ff967a2231ef5a5c3099c0fa10421f8 /sources
parent4992f01a5a251a92c6df8ccb57039e7b39097088 (diff)
Revert "PySide2: Fix Qt3D events' modifier enumerations for 5.14"
The build was broken after qt3d/a356d132b2a426ecd7edb7858245266433b3e855 was reverted by qt3d/7f3bba6e8a4a3bdb36f40a636b76c02902c09d02. This reverts commit 38f0302cc99292c8d8cbadbf64918b723d2f7f8d. Change-Id: Ic7fd3c7894d4cf48d3c6fcc57e5a18333a1571f5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources')
-rw-r--r--sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml
index 1c7e1109b..a74c3ab93 100644
--- a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml
+++ b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml
@@ -73,11 +73,11 @@
</object-type>
<object-type name="QMouseEvent">
<enum-type name="Buttons"/>
- <enum-type name="Modifier" flags="Modifiers" since="5.14"/>
+ <enum-type name="Modifiers"/>
</object-type>
<object-type name="QWheelEvent">
<enum-type name="Buttons"/>
- <enum-type name="Modifier" flags="Modifiers" since="5.14"/>
+ <enum-type name="Modifiers"/>
</object-type>
<object-type name="QMouseHandler"/>
<!-- On windows this raise the following error: