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/shiboken.h | |
| 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/shiboken.h')
| -rw-r--r-- | sources/shiboken2/libshiboken/shiboken.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sources/shiboken2/libshiboken/shiboken.h b/sources/shiboken2/libshiboken/shiboken.h index 5bdef1b86..6cdfe65bd 100644 --- a/sources/shiboken2/libshiboken/shiboken.h +++ b/sources/shiboken2/libshiboken/shiboken.h @@ -44,7 +44,6 @@ #include "autodecref.h" #include "basewrapper.h" #include "bindingmanager.h" -#include "conversions.h" #include "gilstate.h" #include "threadstatesaver.h" #include "helper.h" @@ -54,7 +53,6 @@ #include "sbkmodule.h" #include "sbkstring.h" #include "shibokenmacros.h" -#include "typeresolver.h" #include "shibokenbuffer.h" #endif // SHIBOKEN_H |