diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-08-07 23:44:06 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-10-25 08:17:49 +0000 |
| commit | 33bb2851ffbdc2f22cca1293ac2a5c185bf799e2 (patch) | |
| tree | f4937808a87174d0d17ceeae9eae26939cadf18f /sources | |
| parent | f001c15b9bccc91167900e33fcb724d2be247c66 (diff) | |
Qt3DInput: add more classes and ownership transfer
Task-number: PYSIDE-487
Change-Id: Ibd984747f091ccb355881f869ed327a9dbbf5dbb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml index f2b408257..ebac94f03 100644 --- a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml +++ b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml @@ -45,7 +45,9 @@ <namespace-type name="Qt3DInput"> <object-type name="QAbstractActionInput"/> <object-type name="QAbstractAxisInput"/> - <object-type name="QAbstractPhysicalDevice"/> + <object-type name="QAbstractPhysicalDevice"> + <enum-type name="DeviceStatus"/> + </object-type> <object-type name="QAction"/> <object-type name="QActionInput"/> <object-type name="QAnalogAxisInput"/> @@ -57,12 +59,17 @@ <object-type name="QButtonAxisInput"/> <object-type name="QInputAspect"/> <object-type name="QInputChord"/> + <!-- On windows this raises the following error: + type 'Qt3DInput::QInputDeviceIntegration' is specified in typesystem, but not defined. + This could potentially lead to compilation errors. + <object-type name="QInputDeviceIntegration"/> + --> <object-type name="QInputSequence"/> <object-type name="QInputSettings"/> + <object-type name="QKeyboardDevice"/> <object-type name="QKeyboardHandler"/> <object-type name="QKeyEvent"/> <object-type name="QLogicalDevice"/> - <object-type name="QKeyboardDevice"/> <object-type name="QMouseDevice"> <enum-type name="Axis"/> </object-type> @@ -75,5 +82,11 @@ <enum-type name="Modifiers"/> </object-type> <object-type name="QMouseHandler"/> + <!-- On windows this raise the following error: + qt3dinput_module_wrapper.cpp.obj : error LNK2019: + unresolved external symbol "void __cdecl init_Qt3DInput_QPhysicalDeviceCreatedChangeBase(struct _object *)" + (?init_Qt3DInput_QPhysicalDeviceCreatedChangeBase@@YAXPAU_object@@@Z) referenced in function _PyInit_Qt3DInput + <object-type name="QPhysicalDeviceCreatedChangeBase"/> + --> </namespace-type> </typesystem> |