diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-16 13:45:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-16 13:45:11 +0200 |
| commit | c121c29952f3070e110dc9a9c86bf5fd41c14d92 (patch) | |
| tree | 8bf68b6d179ec34b7b85dc76b09945bbf775e562 /sources/shiboken2/libshiboken/sbkstaticstrings.cpp | |
| parent | 3895f0b107ff27aea4eefe390271b176e3af73b7 (diff) | |
| parent | 8df43d8c9d704a3abcc58b8ba84fc6fbfee2c433 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: I1c48ecc24ff07e760415cea1d7ed512a99c838a1
Diffstat (limited to 'sources/shiboken2/libshiboken/sbkstaticstrings.cpp')
| -rw-r--r-- | sources/shiboken2/libshiboken/sbkstaticstrings.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp b/sources/shiboken2/libshiboken/sbkstaticstrings.cpp index 42d20d133..04069a4d1 100644 --- a/sources/shiboken2/libshiboken/sbkstaticstrings.cpp +++ b/sources/shiboken2/libshiboken/sbkstaticstrings.cpp @@ -54,6 +54,7 @@ namespace PyName { // exported: STATIC_STRING_IMPL(dumps, "dumps") STATIC_STRING_IMPL(loads, "loads") +STATIC_STRING_IMPL(result, "result") // Internal: STATIC_STRING_IMPL(classmethod, "classmethod") |