diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:41:11 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:51:45 +0200 |
commit | d850748283698596327653ec30decdbd6c964af8 (patch) | |
tree | 6efc71e7877294fb616f88f1f17f089d4dce1b84 /sources/shiboken2/libshiboken/sbkstring.h | |
parent | 46ff21ee14e00b992b49562943274d62f2b5b456 (diff) | |
parent | ffae5fe2f3312fdad7ef5880308dae4fd31fec94 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib2eeca97ebabcff53ef7ddd9fc769be6424db39f
Diffstat (limited to 'sources/shiboken2/libshiboken/sbkstring.h')
-rw-r--r-- | sources/shiboken2/libshiboken/sbkstring.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken2/libshiboken/sbkstring.h b/sources/shiboken2/libshiboken/sbkstring.h index d437f1c77..a6b5fbeed 100644 --- a/sources/shiboken2/libshiboken/sbkstring.h +++ b/sources/shiboken2/libshiboken/sbkstring.h @@ -44,9 +44,9 @@ #include "shibokenmacros.h" #if PY_MAJOR_VERSION >= 3 - #define SBK_STR_NAME "unicode" + #define SBK_BYTES_NAME "bytes" #else - #define SBK_STR_NAME "str" + #define SBK_BYTES_NAME "str" #endif namespace Shiboken |