diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-15 14:38:01 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-16 15:05:20 +0100 |
| commit | b6d8b5f77f5721d8b43c9d7b14f0c2aa15a519a0 (patch) | |
| tree | d10d746908c3c7d43cad7d76ed46b8ff274f60d8 /sources/pyside6/libpyside/pysidestaticstrings.cpp | |
| parent | 0d0ffa51609670d3a034c0b5ac5d2b6855bf9372 (diff) | |
libpyside: Rename the static strings
Shiboken::Py(Magic)Name needs to be disambiguated from
PySide::Py(Magic)Name as otherwise
using namespace Shiboken;
using namespace PySide;
leads to ambiguities in jumbo builds.
Task-number: PYSIDE-2155
Change-Id: I7ffd1c9325f9c9a83be8ef797aebb096cc15f593
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pysidestaticstrings.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pysidestaticstrings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside6/libpyside/pysidestaticstrings.cpp b/sources/pyside6/libpyside/pysidestaticstrings.cpp index 637e184be..92f4b204c 100644 --- a/sources/pyside6/libpyside/pysidestaticstrings.cpp +++ b/sources/pyside6/libpyside/pysidestaticstrings.cpp @@ -13,7 +13,7 @@ PyObject *funcName() \ namespace PySide { -namespace PyName +namespace PySideName { STATIC_STRING_IMPL(qtConnect, "connect") STATIC_STRING_IMPL(qtDisconnect, "disconnect") @@ -27,7 +27,7 @@ STATIC_STRING_IMPL(parameters, "parameters") STATIC_STRING_IMPL(property, "property") STATIC_STRING_IMPL(select_id, "select_id") } // namespace PyName -namespace PyMagicName +namespace PySideMagicName { STATIC_STRING_IMPL(code, "__code__") STATIC_STRING_IMPL(doc, "__doc__") |