diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 15:50:34 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 15:50:38 +0100 |
commit | b197a0dbb9f317dd9061ac002b039c53ab662d4e (patch) | |
tree | 29f852df50f2b8db8ed8d495749717c66d11a7c6 /sources/shiboken2/shibokenmodule/typesystem_shiboken.xml | |
parent | 63ab34b618538b6ab1a186754031ed88d730dcd3 (diff) | |
parent | 06e4edac7133d322fe3398502396e1cd8afd8329 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ib359480f79ee4c2348f1cf1e5bf5f423f39be474
Diffstat (limited to 'sources/shiboken2/shibokenmodule/typesystem_shiboken.xml')
-rw-r--r-- | sources/shiboken2/shibokenmodule/typesystem_shiboken.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/shiboken2/shibokenmodule/typesystem_shiboken.xml b/sources/shiboken2/shibokenmodule/typesystem_shiboken.xml index 18ab52e80..bdb0c9338 100644 --- a/sources/shiboken2/shibokenmodule/typesystem_shiboken.xml +++ b/sources/shiboken2/shibokenmodule/typesystem_shiboken.xml @@ -105,6 +105,7 @@ <extra-includes> <include file-name="sbkversion.h" location="local"/> + <include file-name="voidptr.h" location="local"/> </extra-includes> <inject-code position="end"> // Add __version__ and __version_info__ attributes to the module @@ -116,5 +117,7 @@ PyTuple_SET_ITEM(version, 4, PyInt_FromLong(SHIBOKEN_SERIAL)); PyModule_AddObject(module, "__version_info__", version); PyModule_AddStringConstant(module, "__version__", SHIBOKEN_VERSION); + + VoidPtr::addVoidPtrToModule(module); </inject-code> </typesystem> |