diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp index 08c6d762e..3c6886460 100644 --- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp +++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp @@ -24,13 +24,16 @@ #ifdef slots #undef slots +#define slots_was_defined #endif // must be included first #include #include +#ifdef slots_was_defined #define slots +#endif #if PYSIDE2_ENABLED // PySide Qt integration, must be included before Qt headers diff --git a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i index ad0a756a4..8d019e33f 100644 --- a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i +++ b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i @@ -53,7 +53,9 @@ CONTAINER_TYPEMAPS(QMap) #include "datetime.h" +#ifndef slots #define slots +#endif #include "Code/Interface/QRDInterface.h" #include "Code/pyrenderdoc/PythonContext.h"