diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-17 13:20:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-17 15:43:18 +0200 |
| commit | 7d5e40a10b0bb6ea3c86446e65dd72da33b38da0 (patch) | |
| tree | 605d0c7870e28df882a6a618c9509487b4d427cc | |
| parent | 7a721bea41d41e222a3dad2a02cb2d11b3ad396d (diff) | |
PySide6: Add classes QChannel, QChannelComponent
The required fix in Qt3D should be in now.
Amends 886ed33f84453a05ca04c50ed39240fbfd8e1a9b.
Pick-to: 6.1
Task-number: PYSIDE-1482
Change-Id: I6f211112296713eeeba7b908d5390e30fbc06b8c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt b/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt index 5abec9e0f..e81882e79 100644 --- a/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt +++ b/sources/pyside6/PySide6/Qt3DAnimation/CMakeLists.txt @@ -16,8 +16,8 @@ ${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_qchannel_wrapper.cpp -#${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannelcomponent_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannel_wrapper.cpp +${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannelcomponent_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannelmapper_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qchannelmapping_wrapper.cpp ${Qt3DAnimation_GEN_DIR}/qt3danimation_qclipanimator_wrapper.cpp diff --git a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml index 6074473f5..6916dcd25 100644 --- a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml +++ b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml @@ -65,10 +65,8 @@ <object-type name="QAnimationController"/> <object-type name="QAnimationGroup"/> <object-type name="QBlendedClipAnimator"/> - <!-- FIXME: Needs fix to export comparison operators <value-type name="QChannel"/> <value-type name="QChannelComponent"/> - --> <object-type name="QChannelMapper" since="6.1"/> <object-type name="QChannelMapping"/> <object-type name="QClipAnimator"/> |