diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-06 18:10:17 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-06 18:10:17 +0100 |
| commit | b94112ea6c60ed9a4990bcfe4a8ad0a96e90aecd (patch) | |
| tree | 60417ebf06b1e4ec63fb8fccac2ac0e4070917f0 /sources/pyside2/libpyside/pysidesignal.cpp | |
| parent | a7d32524b22fd8ac491d0624d91d828593936d6e (diff) | |
| parent | 6baf94735ff683adb4233825a8b0adbd68e9ed8a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I116f2abfda7263fac8a31ffbe8fc82bfa0cbc618
Diffstat (limited to 'sources/pyside2/libpyside/pysidesignal.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysidesignal.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/pysidesignal.cpp b/sources/pyside2/libpyside/pysidesignal.cpp index ee435ab37..be4c367f7 100644 --- a/sources/pyside2/libpyside/pysidesignal.cpp +++ b/sources/pyside2/libpyside/pysidesignal.cpp @@ -54,6 +54,7 @@ #include <utility> #define QT_SIGNAL_SENTINEL '2' +#define PyEnumMeta_Check(x) (strcmp(Py_TYPE(arg)->tp_name, "EnumMeta") == 0) namespace PySide { namespace Signal { @@ -241,7 +242,7 @@ int signalTpInit(PyObject *self, PyObject *args, PyObject *kwds) for (Py_ssize_t i = 0, i_max = PyTuple_Size(args); i < i_max; i++) { PyObject *arg = PyTuple_GET_ITEM(args, i); - if (PySequence_Check(arg) && !Shiboken::String::check(arg)) { + if (PySequence_Check(arg) && !Shiboken::String::check(arg) && !PyEnumMeta_Check(arg)) { tupledArgs = true; const auto sig = PySide::Signal::parseSignature(arg); PySide::Signal::appendSignature( |