diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 23:20:59 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-07 23:20:59 +0200 |
| commit | b9a857b0fdcad47db958df635a5af934a8e90d62 (patch) | |
| tree | a82bee72783db8f9063d857205972e71b1df3994 /sources/pyside2/PySide2 | |
| parent | 768541fb2e81a426daeffc2f81dcca42ecc43919 (diff) | |
| parent | d9f4a921ca88bf0bd340f42a874cf7c22b6b1a36 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I920a77a3a8c79bba0fd7e5e4f990facf4081ca08
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt index 73682b3bc..5875854d8 100644 --- a/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DAnimation/CMakeLists.txt @@ -8,14 +8,20 @@ ${Qt3DAnimation_GEN_DIR}/qt3danimation_qabstractclipanimator_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qabstractclipblendnode_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qadditiveclipblend_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationaspect_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationcallback_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationclip_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationcliploader_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationcontroller_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qanimationgroup_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qblendedclipanimator_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qclipanimator_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qclock_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qkeyframe_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qkeyframeanimation_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qlerpclipblend_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qmorphinganimation_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qmorphtarget_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qskeletonmapping_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qvertexblendanimation_wrapper.cpp # module is always needed ${Qt3DAnimation_GEN_DIR}/qt3danimation_module_wrapper.cpp) diff --git a/sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml b/sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml index 567d7e25a..bba179e00 100644 --- a/sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml +++ b/sources/pyside2/PySide2/Qt3DAnimation/typesystem_3danimation.xml @@ -53,10 +53,21 @@ <object-type name="QAbstractClipBlendNode"/> <object-type name="QAdditiveClipBlend"/> <object-type name="QAnimationAspect"/> + <object-type name="QAnimationCallback"> + <enum-type name="Flag"/> + </object-type> + <object-type name="QAnimationClip"/> + <object-type name="QAnimationClipLoader"> + <enum-type name="Status"/> + </object-type> <object-type name="QAnimationController"/> <object-type name="QAnimationGroup"/> <object-type name="QBlendedClipAnimator"/> <object-type name="QClipAnimator"/> + <object-type name="QClock"/> + <object-type name="QKeyFrame"> + <enum-type name="InterpolationType"/> + </object-type> <object-type name="QKeyframeAnimation"> <enum-type name="RepeatMode"/> </object-type> @@ -65,6 +76,7 @@ <enum-type name="Method"/> </object-type> <object-type name="QMorphTarget"/> + <object-type name="QSkeletonMapping"/> <object-type name="QVertexBlendAnimation"/> </namespace-type> </typesystem> |