diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 12:59:25 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 13:26:37 +0100 |
commit | 06e4edac7133d322fe3398502396e1cd8afd8329 (patch) | |
tree | ba4427a92c4f1eac1963a428a03edf2c0cea4248 /sources/shiboken2/libshiboken/basewrapper.cpp | |
parent | f2063ee4737f90c5d412a9a328672fde32b033eb (diff) | |
parent | 764498b3d033a1c947a40dc1b2237e81b674992b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I72583df407fc5b3caa8bf35fd997889a4ac86512
Diffstat (limited to 'sources/shiboken2/libshiboken/basewrapper.cpp')
-rw-r--r-- | sources/shiboken2/libshiboken/basewrapper.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sources/shiboken2/libshiboken/basewrapper.cpp b/sources/shiboken2/libshiboken/basewrapper.cpp index d90904dec..fc208e520 100644 --- a/sources/shiboken2/libshiboken/basewrapper.cpp +++ b/sources/shiboken2/libshiboken/basewrapper.cpp @@ -39,10 +39,11 @@ #include "basewrapper.h" #include "basewrapper_p.h" +#include "bindingmanager.h" #include "sbkconverter.h" #include "sbkenum.h" +#include "sbkstring.h" #include "autodecref.h" -#include "typeresolver.h" #include "gilstate.h" #include <string> #include <cstring> @@ -53,6 +54,7 @@ #include "threadstatesaver.h" #include "signature.h" #include "qapp_macro.h" +#include "voidptr.h" namespace { void _destroyParentInfo(SbkObject* obj, bool keepReference); @@ -550,7 +552,6 @@ void init() Conversions::init(); - initTypeResolver(); PyEval_InitThreads(); //Init private data @@ -565,6 +566,8 @@ void init() if (PyType_Ready(reinterpret_cast<PyTypeObject *>(&SbkObject_Type)) < 0) Py_FatalError("[libshiboken] Failed to initialise Shiboken.BaseWrapper type."); + VoidPtr::init(); + shibokenAlreadInitialised = true; } |