diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-01 08:13:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-11-01 08:13:20 +0100 |
| commit | 1c962cbff7e961a768d7bfaa2c9f63dd4905cc6b (patch) | |
| tree | 84dcd0e228162314151de92ffb618fe9b4f8916e /sources/pyside2/PySide2/QtCore | |
| parent | 0d6212d958ae1ef902d055e48ec951ee07d1a9b1 (diff) | |
| parent | 8383c2ff7f383385707bd2fc3e33071988507910 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I5a8f41a2236601b7c5466586dd1cfc92c1afc391
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 005fd0684..cff7e0af0 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -3078,9 +3078,8 @@ </modify-function> <modify-function signature="readData(char*,qint64)"> <inject-code class="target"> - QByteArray ba; - ba.resize(%2); - %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size()); + QByteArray ba(1 + int(%2), char(0)); + %CPPSELF.%FUNCTION_NAME(ba.data(), int(%2)); %PYARG_0 = Shiboken::String::fromCString(ba.constData()); </inject-code> <modify-argument index="1"> @@ -3102,9 +3101,8 @@ </modify-function> <modify-function signature="readLineData(char*,qint64)"> <inject-code class="target"> - QByteArray ba; - ba.resize(%2); - %CPPSELF.%FUNCTION_NAME(ba.data(), ba.size()); + QByteArray ba(1 + int(%2), char(0)); + %CPPSELF.%FUNCTION_NAME(ba.data(), int(%2)); %PYARG_0 = Shiboken::String::fromCString(ba.constData()); </inject-code> <modify-argument index="1"> |