diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-06-03 13:11:29 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-06-05 11:22:12 +0200 |
| commit | 387ea2999c6d30aebfed30ec565e88ffae368b9c (patch) | |
| tree | c1a0d35bc626c67813eb69c0fcdd7c83e3f7a55b /sources/pyside2/PySide2/glue | |
| parent | 4f52e7b65cde36fb13178fa4b41279761859df2c (diff) | |
Add QSocketDescriptor class
This was required by the change in QSocketNotifier in 5.15.
Additionally, an alias, DescriptorType, was required to make
the constructor to work.
Fixes: PYSIDE-1317
Change-Id: Ib75e6024e467eb72f374a1179cb7416b1ea8a853
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/glue')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtcore.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index 9b927cce4..1e9d9636e 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -1288,6 +1288,14 @@ QByteArray ba(1 + int(%2), char(0)); %CPPSELF.%FUNCTION_NAME(Shiboken::String::toCString(%PYARG_1), Shiboken::String::len(%PYARG_1)); // @snippet qcryptographichash-adddata +// @snippet qsocketdescriptor +#ifdef WIN32 +using DescriptorType = Qt::HANDLE; +#else +using DescriptorType = int; +#endif +// @snippet qsocketdescriptor + // @snippet qsocketnotifier PyObject *socket = %PYARG_1; if (socket != nullptr) { |