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:
baldurk
2017-04-28 19:36:09 +01:00
parent c05bea4563
commit 829e1aa77e
2 changed files with 5 additions and 0 deletions
@@ -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
+2
View File
@@ -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"