diff options
Diffstat (limited to 'PySide2')
| -rw-r--r-- | PySide2/QtCore/typesystem_core_common.xml | 4 | ||||
| -rw-r--r-- | PySide2/QtMacExtras/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | PySide2/QtMacExtras/typesystem_macextras.xml | 4 | ||||
| -rw-r--r-- | PySide2/global.h.in | 10 |
4 files changed, 5 insertions, 15 deletions
diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml index 53cc5faa..13f24838 100644 --- a/PySide2/QtCore/typesystem_core_common.xml +++ b/PySide2/QtCore/typesystem_core_common.xml @@ -937,7 +937,7 @@ <enum-type name="ToolBarArea" flags="ToolBarAreas" /> <enum-type name="ToolBarAreaSizes"/> <enum-type name="ToolButtonStyle"/> - <enum-type name="TouchPointState" since="4.6"/> + <enum-type name="TouchPointState" flags="TouchPointStates" since="4.6"/> <enum-type name="TransformationMode"/> <enum-type name="UIEffect"/> <enum-type name="WhiteSpaceMode" /> @@ -4205,7 +4205,7 @@ s1.addTransition(button.clicked, s1h)</code> <!-- TODO: this need be removed --> <suppress-warning text="skipping function '*', unmatched return type '*'"/> - <suppress-warning text="skipping function '*', unmatched parameter type '*'"/> + <suppress-warning text="skipping function '*', unmatched type '*"/> <suppress-warning text="enum 'q_static_assert_result39' does not have a type entry or is not an enum"/> <suppress-warning text="horribly broken type ''"/> diff --git a/PySide2/QtMacExtras/CMakeLists.txt b/PySide2/QtMacExtras/CMakeLists.txt index 9bb8dd00..a98f18e6 100644 --- a/PySide2/QtMacExtras/CMakeLists.txt +++ b/PySide2/QtMacExtras/CMakeLists.txt @@ -1,7 +1,7 @@ project(QtMacExtras) set(QtMacExtras_SRC -#${QtMacExtras_GEN_DIR}/qmacpasteboardmime_wrapper.cpp +${QtMacExtras_GEN_DIR}/qmacpasteboardmime_wrapper.cpp ${QtMacExtras_GEN_DIR}/qmactoolbar_wrapper.cpp ${QtMacExtras_GEN_DIR}/qmactoolbaritem_wrapper.cpp diff --git a/PySide2/QtMacExtras/typesystem_macextras.xml b/PySide2/QtMacExtras/typesystem_macextras.xml index f52597cd..55c7d016 100644 --- a/PySide2/QtMacExtras/typesystem_macextras.xml +++ b/PySide2/QtMacExtras/typesystem_macextras.xml @@ -43,11 +43,11 @@ <load-typesystem name="typesystem_core.xml" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/> - <!-- + <function signature="qRegisterDraggedTypes(QStringList)" since="5.2"/> + <object-type name="QMacPasteboardMime" since="5.2"> <enum-type name="QMacPasteboardMimeType"/> </object-type> - --> <object-type name="QMacToolBar" since="5.3"/> <object-type name="QMacToolBarItem" since="5.3"> <enum-type name="StandardItem"/> diff --git a/PySide2/global.h.in b/PySide2/global.h.in index 40b107ee..0c7e2114 100644 --- a/PySide2/global.h.in +++ b/PySide2/global.h.in @@ -54,22 +54,12 @@ // Make "signals:", "slots:" visible as access specifiers #define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a))) -#include <QtCore/QtCore> -#if @Qt5Gui_FOUND@ -# include <QtGui/QtGui> -#endif -#if @Qt5Widgets_FOUND@ -# include <QtWidgets/QtWidgets> -#endif - #include "qpytextobject.h" // PySide class #if @ENABLE_X11@ # if @Qt5X11Extras_FOUND@ # include <QtX11Extras/QX11Info> # endif -#elif @ENABLE_MAC@ -# include <QtGui/qmacstyle_mac.h> #endif // QT_WIDGETS_LIB must be defined to QSqlRelationalDelegate become visible. |