diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-07-21 17:12:49 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:38 -0300 |
| commit | 5902ca2e66913a374cbfde629b97807e4e2b4bc4 (patch) | |
| tree | bab526d03b10f6f51eb5572bd70075253c128410 /PySide/QtCore | |
| parent | 0b6bafdd447f56c9910a41f039f9ed1431af04ee (diff) | |
Fix bug 937 - "missing pid method in QProcess"
Diffstat (limited to 'PySide/QtCore')
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index fe3849233..3a764c90d 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -240,7 +240,6 @@ <rejection class="QCoreApplication" function-name="setEventFilter"/> <rejection class="QFile" function-name="setDecodingFunction"/> <rejection class="QFile" function-name="setEncodingFunction"/> - <rejection class="QProcess" function-name="pid"/> <rejection class="QRegion" function-name="cleanUp"/> <rejection class="QSettings" function-name="registerFormat"/> <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/> @@ -2378,6 +2377,20 @@ %PYARG_0 = Shiboken::makeTuple(retval, pid); </inject-code> </modify-function> + <!-- Function removed because on windows it returns a win32 specific structure --> + <modify-function signature="pid()const" remove="all" /> + <add-function signature="pid()" return-type="long"> + <inject-code> + 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); + </inject-code> + </add-function> <!--### Obsolete in 4.3--> <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <modify-function signature="readChannelMode()const" remove="all"/> |