diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-25 10:30:50 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-26 09:19:40 +0000 |
commit | f4a6d74852b0ba6711195a9c3fc9356e677a3409 (patch) | |
tree | e35347e8819a7d1aed00846d4ec24611930a164c /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
parent | 33bb2851ffbdc2f22cca1293ac2a5c185bf799e2 (diff) |
PySide2: Re-enable native event filters
Add QAbstractNativeEventFilter. Re-add the native event filter
functions on QWindow and QWidget, modified to return a tuple
bool/long, using a modification from PySide.
Task-number: PYSIDE-790
Change-Id: I86fef1a0c168e69fb3391cd882ea05190985384d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
-rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 838d95896..d2951fe9c 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -938,9 +938,6 @@ <rejection class="" enum-name="QtValidLicenseForGuiModule"/> <rejection class="" enum-name="QtValidLicenseForScriptModule"/> <rejection class="" enum-name="QtValidLicenseForHelpModule"/> - <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/> - <rejection class="QAbstractEventDispatcher" function-name="filterNativeEvent"/> - <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/> <!-- Internal --> <rejection class="QAbstractFileEngine"/> <!-- <rejection class="QAbstractFileEngine" function-name="endEntryList"/> @@ -2978,6 +2975,26 @@ <object-type name="QXmlStreamEntityResolver"/> <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> + <object-type name="QAbstractNativeEventFilter"> + <!-- see QWidget::nativeEvent(), QWindow::nativeEvent() --> + <modify-function signature="nativeEventFilter(const QByteArray&,void*,long*)"> + <modify-argument index="3"> + <remove-argument/> + <conversion-rule class="native"> + <insert-template name="return_native_eventfilter_conversion_variables"/> + </conversion-rule> + </modify-argument> + <modify-argument index="return"> + <replace-type modified-type="PyObject"/> + <conversion-rule class="native"> + <insert-template name="return_native_eventfilter_conversion"/> + </conversion-rule> + </modify-argument> + <inject-code position="end"> + <insert-template name="return_native_eventfilter"/> + </inject-code> + </modify-function> + </object-type> <object-type name="QEventLoop"> <enum-type name="ProcessEventsFlag" flags="ProcessEventsFlags"/> |