Merge pull request #104 from uglide/allow_embedding_in_qt_app

Use python.h wrapping to allow embedding as-is in any Qt-based project
thp · Jun 6, 2019 · ed279cb · ed279cb
2 parents 395491f + 4c2bc52
commit ed279cb
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/src/ensure_gil_state.h b/src/ensure_gil_state.h
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  **/
 
-#include "Python.h"
+#include "python_wrap.h"
 
 class EnsureGILState {
     public:

diff --git a/src/pyglarea.h b/src/pyglarea.h
@@ -19,7 +19,7 @@
 #ifndef PYOTHERSIDE_PYGLAREA_H
 #define PYOTHERSIDE_PYGLAREA_H
 
-#include "Python.h"
+#include "python_wrap.h"
 
 #include <QString>
 #include <QVariant>

diff --git a/src/pyglrenderer.h b/src/pyglrenderer.h
@@ -19,7 +19,7 @@
 #ifndef PYOTHERSIDE_PYGLRENDERER_H
 #define PYOTHERSIDE_PYGLRENDERER_H
 
-#include "Python.h"
+#include "python_wrap.h"
 
 #include <QVariant>
 #include <QString>

diff --git a/src/pyobject_converter.h b/src/pyobject_converter.h
@@ -22,7 +22,7 @@
 #include "converter.h"
 #include "pyqobject.h"
 
-#include "Python.h"
+#include "python_wrap.h"
 #include "datetime.h"
 #include <QDebug>
 

diff --git a/src/pyobject_ref.h b/src/pyobject_ref.h
@@ -20,7 +20,7 @@
 #ifndef PYOTHERSIDE_PYOBJECT_REF_H
 #define PYOTHERSIDE_PYOBJECT_REF_H
 
-#include "Python.h"
+#include "python_wrap.h"
 
 #include <QMetaType>
 

diff --git a/src/pyqobject.h b/src/pyqobject.h
@@ -19,7 +19,7 @@
 #ifndef PYOTHERSIDE_PYQOBJECT_H
 #define PYOTHERSIDE_PYQOBJECT_H
 
-#include "Python.h"
+#include "python_wrap.h"
 
 #include "qobject_ref.h"
 

diff --git a/src/python_wrap.h b/src/python_wrap.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#pragma push_macro("slots")
+#undef slots
+#include "Python.h"
+#pragma pop_macro("slots")
diff --git a/src/qpython.h b/src/qpython.h
@@ -19,7 +19,7 @@
 #ifndef PYOTHERSIDE_QPYTHON_H
 #define PYOTHERSIDE_QPYTHON_H
 
-#include "Python.h"
+#include "python_wrap.h"
 
 #include <QVariant>
 #include <QObject>

diff --git a/src/qpython_priv.h b/src/qpython_priv.h
@@ -19,7 +19,7 @@
 #ifndef PYOTHERSIDE_QPYTHON_PRIV_H
 #define PYOTHERSIDE_QPYTHON_PRIV_H
 
-#include "Python.h"
+#include "python_wrap.h"
 
 #include "pyobject_ref.h"
 #include "pyqobject.h"