diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-25 16:33:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-25 16:33:12 +0200 |
| commit | 39ac266455cc1c0ae970a47c34d3a6bc7372d750 (patch) | |
| tree | 9577fe06bcb0e3096ef85af929a91eb37b037452 /sources/pyside2/libpyside/pysideqflags.cpp | |
| parent | 9115712ef3a1be8b401c9cd306792dbc30c89bf0 (diff) | |
| parent | 6717d3540fac74c91d9381958a08e60f6532d402 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: Id0650ec2b46f3c67eb2c9b400f5b31aab98c3c58
Diffstat (limited to 'sources/pyside2/libpyside/pysideqflags.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysideqflags.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/pysideqflags.cpp b/sources/pyside2/libpyside/pysideqflags.cpp index 8cf9aa7b2..d7e6b4f4c 100644 --- a/sources/pyside2/libpyside/pysideqflags.cpp +++ b/sources/pyside2/libpyside/pysideqflags.cpp @@ -174,7 +174,7 @@ namespace QFlags char qualname[200]; // PYSIDE-747: Here we insert now the full class name. strcpy(qualname, name); - // Careful: PyType_FromSpec does not allocate the string. + // Careful: SbkType_FromSpec does not allocate the string. PyType_Spec *newspec = new PyType_Spec; newspec->name = strdup(qualname); newspec->basicsize = SbkNewQFlagsType_spec.basicsize; @@ -186,7 +186,7 @@ namespace QFlags SbkNewQFlagsType_slots[idx].pfunc = numberMethods[idx].pfunc; } newspec->slots = SbkNewQFlagsType_spec.slots; - PyTypeObject *type = (PyTypeObject *)PyType_FromSpec(newspec); + PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(newspec); Py_TYPE(type) = &PyType_Type; PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type); |