mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-06 01:50:38 +00:00
Fix handling of 'slots' Qt keyword clashing with python
* On linux without any PCH we have a slightly different case to windows with the PCH, so we need to be careful not to redefine the macro.
This commit is contained in:
@@ -24,13 +24,16 @@
|
||||
|
||||
#ifdef slots
|
||||
#undef slots
|
||||
#define slots_was_defined
|
||||
#endif
|
||||
|
||||
// must be included first
|
||||
#include <Python.h>
|
||||
#include <frameobject.h>
|
||||
|
||||
#ifdef slots_was_defined
|
||||
#define slots
|
||||
#endif
|
||||
|
||||
#if PYSIDE2_ENABLED
|
||||
// PySide Qt integration, must be included before Qt headers
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user