projects
/
pyqt5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b7e7423
)
Reverted the conversion of bytes to 'const char *'
author
Dmitry Shachnev
<mitya57@gmail.com>
Thu, 25 Aug 2016 18:11:37 +0000
(21:11 +0300)
committer
Dmitry Shachnev
<mitya57@debian.org>
Sat, 21 Jan 2017 08:26:05 +0000
(08:26 +0000)
The latter is not supported by QMetaType and gives QSignalSpy a problem.
Patch-Name: bytes_conversion.diff
Gbp-Pq: Name bytes_conversion.diff
qpy/QtCore/qpycore_chimera.cpp
patch
|
blob
|
history
diff --git
a/qpy/QtCore/qpycore_chimera.cpp
b/qpy/QtCore/qpycore_chimera.cpp
index 920fee6763cf6182f83bc145b06c14cab83559b3..2c8f8b86d872b5edc36ce93a89ec411a6882cf81 100644
(file)
--- a/
qpy/QtCore/qpycore_chimera.cpp
+++ b/
qpy/QtCore/qpycore_chimera.cpp
@@
-416,11
+416,6
@@
bool Chimera::parse_py_type(PyTypeObject *type_obj)
_type = sipType_QString;
_metatype = QMetaType::QString;
}
- else if (type_obj == &PyBytes_Type)
- {
- _metatype = -1;
- _name = "const char*";
- }
#else
else if (type_obj == &PyString_Type || type_obj == &PyUnicode_Type)
{