diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-23 14:32:38 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-02 08:48:43 +0000 |
| commit | 82934bc00c2de7ea51fd7e95601472fcdf7b6aea (patch) | |
| tree | cecc2542b0c18c5160cd5fb656f684327336352f /sources/pyside2/PySide2/glue/qtcore.cpp | |
| parent | 908c89e9c08297ca854e7c2064b93368d215d0b2 (diff) | |
Adapt to recent changes in qtbase
- Remove QProcess::pid(), adapt test
(qtbase/0f8848b7e25e4d8fb9265ff6e0aa31946addd741)
- Remove enum from QPrinter
- Add enum GrabTransition to QPointingDevice
- Remove deprecated functions from QByteArray, QXmlStreamAttributes
- Adapt Qml tests
- Remove fake property from QLayout
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I98cc90723cbeda15b23c5b22d026cb2ab9a358ff
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/glue/qtcore.cpp')
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtcore.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index eb8d6dff4..e9c60aeac 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -1352,17 +1352,6 @@ PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval)); PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[qint64](pid)); // @snippet qprocess-startdetached -// @snippet qprocess-pid -long result; -#ifdef WIN32 - _PROCESS_INFORMATION *procInfo = %CPPSELF.%FUNCTION_NAME(); - result = procInfo ? procInfo->dwProcessId : 0; -#else - result = %CPPSELF.%FUNCTION_NAME(); -#endif -%PYARG_0 = %CONVERTTOPYTHON[long](result); -// @snippet qprocess-pid - // @snippet qcoreapplication-init static void QCoreApplicationConstructor(PyObject *self, PyObject *pyargv, QCoreApplicationWrapper **cptr) { |