aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-11-01 08:13:02 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-11-01 08:13:20 +0100
commit1c962cbff7e961a768d7bfaa2c9f63dd4905cc6b (patch)
tree84dcd0e228162314151de92ffb618fe9b4f8916e /sources/pyside2/PySide2
parent0d6212d958ae1ef902d055e48ec951ee07d1a9b1 (diff)
parent8383c2ff7f383385707bd2fc3e33071988507910 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Diffstat (limited to 'sources/pyside2/PySide2')
-rw-r--r--sources/pyside2/PySide2/QtCore/typesystem_core_common.xml10
-rw-r--r--sources/pyside2/PySide2/typesystem_templates.xml2
2 files changed, 5 insertions, 7 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">
diff --git a/sources/pyside2/PySide2/typesystem_templates.xml b/sources/pyside2/PySide2/typesystem_templates.xml
index fb5750b48..1cac1a6ba 100644
--- a/sources/pyside2/PySide2/typesystem_templates.xml
+++ b/sources/pyside2/PySide2/typesystem_templates.xml
@@ -203,7 +203,7 @@
</template>
<template name="fix_char*">
- char val_;
+ char val_{};
%BEGIN_ALLOW_THREADS
%RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;val_);
%END_ALLOW_THREADS