diff options
| author | Christian Tismer <ctismer@gmail.com> | 2015-07-10 21:35:19 +0200 |
|---|---|---|
| committer | Christian Tismer <ctismer@gmail.com> | 2015-07-10 21:35:19 +0200 |
| commit | 5f6910f22689eee4d01f242d9d7c7d2cf63ef95e (patch) | |
| tree | db21f038750d5470fb45fca6f2f985e16e069b09 /PySide | |
| parent | d3865183bde8905ac2e8a2452f013031e865cdf8 (diff) | |
add the new QWindow class to QtGui and the things that are pulled in by this.
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index ce5b9867f..bff4f7489 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -99,6 +99,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qstandarditem_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qstandarditemmodel_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qstatustipevent_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qstringlistmodel_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qsurface_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qsurfaceformat_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qsyntaxhighlighter_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtabletevent_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtextblock_iterator_wrapper.cpp @@ -141,6 +143,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qvector3d_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qvector4d_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwhatsthisclickedevent_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwheelevent_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwindow_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwindowstatechangeevent_wrapper.cpp ${SPECIFIC_OS_FILES} diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 3bbb17f8c..756e0a76a 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -2645,7 +2645,7 @@ </inject-code> </add-function> <add-function signature="operator==(const QMatrix2x4&)" return-type="bool" /> - </value-type> + </value-type> <value-type name="QMatrix3x2" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> @@ -3329,5 +3329,30 @@ <!-- This enum is present on QtCore --> <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared" /> + <!-- Qt5: here the new QWindow stuff and what it pulls in --> + <object-type name="QSurface"> + <enum-type name="SurfaceClass"/> + <enum-type name="SurfaceType"/> + </object-type> + <rejection class="QSurface" field-name="m_reserved"/> + <value-type name="QSurfaceFormat"> + <enum-type name="FormatOption" flags="FormatOptions"/> + <enum-type name="OpenGLContextProfile"/> + <enum-type name="RenderableType"/> + <enum-type name="SwapBehavior"/> + </value-type> + <primitive-type name="QPlatformSurface"> + <extra-includes> + <include file-name="QtGui/qpa/qplatformsurface.h" location="global"/> + </extra-includes> + </primitive-type> + + <object-type name="QWindow"> + <enum-type name="AncestorMode"/> + <enum-type name="Visibility"/> + </object-type> + <!-- Qt5: not sure if this needs support, skipped for now --> + <rejection class="QWindow" function-name="nativeEvent"/>" + </typesystem> |