diff options
Diffstat (limited to 'sources/pyside2/PySide2/Qt3DInput')
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml | 25 |
2 files changed, 23 insertions, 17 deletions
diff --git a/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt index 694f373f8..a3366c9ba 100644 --- a/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DInput/CMakeLists.txt @@ -46,11 +46,10 @@ set(Qt3DInput_libraries pyside2 set(Qt3DInput_deps Qt3DCore) -create_pyside_module(Qt3DInput - Qt3DInput_include_dirs - Qt3DInput_libraries - Qt3DInput_deps - Qt3DInput_SOURCE_DIR - Qt3DInput_SRC - "" - ${Qt3DInput_BINARY_DIR}/typesystem_3dinput.xml) +create_pyside_module(NAME Qt3DInput + INCLUDE_DIRS Qt3DInput_include_dirs + LIBRARIES Qt3DInput_libraries + DEPS Qt3DInput_deps + TYPESYSTEM_PATH Qt3DInput_SOURCE_DIR + SOURCES Qt3DInput_SRC + TYPESYSTEM_NAME ${Qt3DInput_BINARY_DIR}/typesystem_3dinput.xml) diff --git a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml index dd72c5c01..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,29 +59,34 @@ <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"> - <modify-function signature="QKeyEvent(const Qt3DInput::QKeyEvent&)" remove="all"/> - </object-type> + <object-type name="QKeyEvent"/> <object-type name="QLogicalDevice"/> - <object-type name="QKeyboardDevice"/> <object-type name="QMouseDevice"> <enum-type name="Axis"/> </object-type> - <!-- Fixme: shiboken2 mistakenly thinks that Qt3DInput::QMouseEvent(::QMouseEvent) - is a copy constructor of Qt3DInput::QMouseEvent. Work around by suppressing them --> <object-type name="QMouseEvent"> <enum-type name="Buttons"/> <enum-type name="Modifiers"/> - <modify-function signature="QMouseEvent(const Qt3DInput::QMouseEvent&)" remove="all"/> </object-type> <object-type name="QWheelEvent"> <enum-type name="Buttons"/> <enum-type name="Modifiers"/> - <modify-function signature="QWheelEvent(const Qt3DInput::QWheelEvent&)" remove="all"/> </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> |