diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2016-12-22 12:05:50 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2016-12-22 11:49:50 +0000 |
| commit | 9f3aba9d228850a562f57484072c9c9876f60bcc (patch) | |
| tree | 79685cf4e8366386de03e15cd149d32ae5760555 | |
| parent | 2c3651de714b0fed0592395ed5c83521e9a51014 (diff) | |
Add some missing OpenGL and accessibility related items to QtGui
This will be used by the QtQuick typesystem changes, which depend
on those classes.
Task-number: PYSIDE-355
Change-Id: I48f5d435b0dae38c266c62bf9ee0a3f15eb9e21a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | PySide2/QtGui/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | PySide2/QtGui/typesystem_gui_common.xml | 24 |
2 files changed, 33 insertions, 0 deletions
diff --git a/PySide2/QtGui/CMakeLists.txt b/PySide2/QtGui/CMakeLists.txt index 4621a7a1..e4f4e46e 100644 --- a/PySide2/QtGui/CMakeLists.txt +++ b/PySide2/QtGui/CMakeLists.txt @@ -22,6 +22,7 @@ ${QtGui_GEN_DIR}/qdragenterevent_wrapper.cpp ${QtGui_GEN_DIR}/qdragleaveevent_wrapper.cpp ${QtGui_GEN_DIR}/qdragmoveevent_wrapper.cpp ${QtGui_GEN_DIR}/qdropevent_wrapper.cpp +${QtGui_GEN_DIR}/qexposeevent_wrapper.cpp ${QtGui_GEN_DIR}/qfileopenevent_wrapper.cpp ${QtGui_GEN_DIR}/qfocusevent_wrapper.cpp ${QtGui_GEN_DIR}/qfont_wrapper.cpp @@ -95,6 +96,14 @@ ${QtGui_GEN_DIR}/qstandarditem_wrapper.cpp ${QtGui_GEN_DIR}/qstandarditemmodel_wrapper.cpp ${QtGui_GEN_DIR}/qstatustipevent_wrapper.cpp ${QtGui_GEN_DIR}/qstringlistmodel_wrapper.cpp +${QtGui_GEN_DIR}/qopenglcontext_wrapper.cpp +${QtGui_GEN_DIR}/qaccessible_wrapper.cpp +${QtGui_GEN_DIR}/qaccessible_state_wrapper.cpp +${QtGui_GEN_DIR}/qaccessibleinterface_wrapper.cpp +${QtGui_GEN_DIR}/qscreen_wrapper.cpp +${QtGui_GEN_DIR}/qopenglshader_wrapper.cpp +${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp +${QtGui_GEN_DIR}/qopenglframebufferobject_wrapper.cpp ${QtGui_GEN_DIR}/qsurface_wrapper.cpp ${QtGui_GEN_DIR}/qsurfaceformat_wrapper.cpp ${QtGui_GEN_DIR}/qsyntaxhighlighter_wrapper.cpp diff --git a/PySide2/QtGui/typesystem_gui_common.xml b/PySide2/QtGui/typesystem_gui_common.xml index 72d3becb..2f14ba17 100644 --- a/PySide2/QtGui/typesystem_gui_common.xml +++ b/PySide2/QtGui/typesystem_gui_common.xml @@ -1722,6 +1722,7 @@ </modify-argument> </modify-function> </object-type> + <object-type name="QExposeEvent" polymorphic-id-expression="%1->type() == QEvent::Expose" /> <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type() == QEvent::FileOpen" /> <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() == QEvent::FocusIn || %1->type() == QEvent::FocusOut" /> <object-type name="QHelpEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::ToolTip || %1->type() == QEvent::WhatsThis"/> @@ -3215,6 +3216,29 @@ </object-type> + <value-type name="QAccessible"> + <value-type name="State"/> + <enum-type name="Role"/> + <enum-type name="Text"/> + <enum-type name="RelationFlag"/> + <enum-type name="InterfaceType"/> + <enum-type name="TextBoundaryType"/> + <enum-type name="Event"/> + </value-type> + <object-type name="QAccessibleInterface"> + </object-type> + <object-type name="QOpenGLContext"> + <enum-type name="OpenGLModuleType" /> + </object-type> + <object-type name="QOpenGLFramebufferObject"> + <enum-type name="Attachment" /> + </object-type> + <object-type name="QOpenGLShader" > + <enum-type name="ShaderTypeBit" flags="ShaderType" /> + </object-type> + <object-type name="QOpenGLShaderProgram" /> + <object-type name="QScreen" /> + </typesystem> |