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/pysideclassinfo.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/pysideclassinfo.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pysideclassinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/pysideclassinfo.cpp b/sources/pyside2/libpyside/pysideclassinfo.cpp index c4bace77e..375a31b57 100644 --- a/sources/pyside2/libpyside/pysideclassinfo.cpp +++ b/sources/pyside2/libpyside/pysideclassinfo.cpp @@ -64,7 +64,7 @@ static PyType_Slot PySideClassInfoType_slots[] = { {0, 0} }; static PyType_Spec PySideClassInfoType_spec = { - "PySide2.QtCore.ClassInfo", + "2:PySide2.QtCore.ClassInfo", sizeof(PySideClassInfo), 0, Py_TPFLAGS_DEFAULT, @@ -75,7 +75,7 @@ static PyType_Spec PySideClassInfoType_spec = { PyTypeObject *PySideClassInfoTypeF(void) { static PyTypeObject *type = - reinterpret_cast<PyTypeObject *>(PyType_FromSpec(&PySideClassInfoType_spec)); + reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideClassInfoType_spec)); return type; } |