diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-26 15:57:23 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-26 19:34:48 +0000 |
commit | 95635c21b27e8fd6b80243518ff56862f8856d75 (patch) | |
tree | 93a38cb2d203389023ad674a25dc92c1fb81ca19 /sources | |
parent | 86181fa524ddc91e98cf65730809ed9a0f4bdcde (diff) |
Streamline per platform typesystem files
- Remove no-longer existent macOS-specific classes
- Move QAbstractEventDispatcher back to the core typesystem
- Move all warnings to the core typesystem
Change-Id: I9d733e1a1eb2682784f22ec3b4b7d976db737f02
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 74ed92ee701780b94cab863e462ee7466ce4b9d4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources')
6 files changed, 12 insertions, 41 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index 55dfb76b2..3f19e7879 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -2064,7 +2064,12 @@ </value-type> <object-type name="QXmlStreamEntityResolver"/> - <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> + <object-type name="QAbstractEventDispatcher"> + <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> + <!-- Qt5: had to add this recursive object def. This was crucial to get rid of "pure virtual" --> + <value-type name="TimerInfo"/> + </object-type> + <object-type name="QAbstractNativeEventFilter"> <!-- see QWidget::nativeEvent(), QWindow::nativeEvent() --> <modify-function signature="nativeEventFilter(const QByteArray&,void*,qintptr*)"> @@ -3074,5 +3079,9 @@ <suppress-warning text="skipping field 'QSysInfo::WindowsVersion' with unmatched type 'const QSysInfo::WinVersion'"/> <suppress-warning text="template baseclass 'QListSpecialMethods<T>' of 'QList' is not known"/> - + <suppress-warning text="skipping field 'QSysInfo::MacintoshVersion' with unmatched type 'QSysInfo::MacVersion'"/> + <suppress-warning text="skipping field 'QSysInfo::WindowsVersion' with unmatched type 'QSysInfo::MacVersion'"/> + <suppress-warning text="enum 'QSysInfo::MacVersion' does not have a type entry or is not an enum"/> + <suppress-warning text="enum 'QSysInfo::WinVersion' does not have a type entry or is not an enum"/> + <suppress-warning text="enum 'QSysInfo::Endian' is specified in typesystem, but not declared"/> </typesystem> diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_mac.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_mac.xml index 89d405d6b..bcc174eee 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_mac.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_mac.xml @@ -41,17 +41,9 @@ --> <typesystem package="PySide6.QtCore"> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> - <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> - <object-type name="QAbstractEventDispatcher"> - <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> - <!-- Qt5: had to add this recursive object def. This was crucial to get rid of "pure virtual" --> - <object-type name="TimerInfo"/> - </object-type> <object-type name="QSysInfo"> <enum-type name="Endian"/> <enum-type name="Sizes"/> <enum-type name="MacVersion" since="5.5"/> </object-type> - <suppress-warning text="skipping field 'QSysInfo::WindowsVersion' with unmatched type 'QSysInfo::WinVersion'"/> - <suppress-warning text="enum 'QSysInfo::WinVersion' does not have a type entry or is not an enum"/> </typesystem> diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_win.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_win.xml index 8dbcdae95..c399b7632 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_win.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_win.xml @@ -65,18 +65,10 @@ <insert-template name="checkPyCapsuleOrPyCObject_func"/> </inject-code> - <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> <object-type name="QWinEventNotifier"/> - <object-type name="QAbstractEventDispatcher"> - <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> - <!-- Qt5: had to add this recursive object def. This was crucial to get rid of "pure virtual" --> - <object-type name="TimerInfo"/> - </object-type> <object-type name="QSysInfo"> <enum-type name="Endian"/> <enum-type name="Sizes"/> <enum-type name="WinVersion" since="5.5"/> </object-type> - <suppress-warning text="skipping field 'QSysInfo::MacintoshVersion' with unmatched type 'QSysInfo::MacVersion'"/> - <suppress-warning text="enum 'QSysInfo::MacVersion' does not have a type entry or is not an enum"/> </typesystem> diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_x11.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_x11.xml index c1db58db7..6c8ee529c 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_x11.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_x11.xml @@ -45,17 +45,8 @@ <!-- Qt5: XXX move this to QtGui <include file-name="QTextDocument" location="global"/> --> </primitive-type> <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> - <object-type name="QAbstractEventDispatcher"> - <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> - <!-- Qt5: had to add this recursive object def. This was crucial to get rid of "pure virtual" --> - <object-type name="TimerInfo"/> - </object-type> <object-type name="QSysInfo"> <enum-type name="Endian"/> <enum-type name="Sizes"/> </object-type> - <suppress-warning text="skipping field 'QSysInfo::MacintoshVersion' with unmatched type 'QSysInfo::MacVersion'"/> - <suppress-warning text="skipping field 'QSysInfo::WindowsVersion' with unmatched type 'QSysInfo::MacVersion'"/> - <suppress-warning text="enum 'QSysInfo::MacVersion' does not have a type entry or is not an enum"/> - <suppress-warning text="enum 'QSysInfo::WinVersion' does not have a type entry or is not an enum"/> </typesystem> diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml index 3df668b86..d2c6257c1 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml @@ -40,11 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide6.QtGui"> - <rejection class="*" function-name="qt_mac_set_cursor"/> - <rejection class="*" function-name="macMenu"/> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> - <suppress-warning text="enum 'QSysInfo::Endian' is specified in typesystem, but not declared"/> - <suppress-warning text="type 'QGtkStyle' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/> </typesystem> diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml index f7cc4b7e4..dcf003501 100644 --- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml +++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml @@ -40,16 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide6.QtWidgets"> - <rejection class="*" function-name="qt_mac_set_cursor"/> - <rejection class="*" function-name="macMenu"/> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> - <!-- Qt5: internal - <object-type name="QMacStyle" > - <enum-type name="FocusRectPolicy"/> - <enum-type name="WidgetSizePolicy"/> - </object-type> - --> - <rejection class="QWidget" function-name="macCGHandle"/> - <rejection class="QWidget" function-name="macQDHandle"/> + </typesystem> |