diff options
| author |  wodim | 2017-08-26 15:02:56 +0200 |
|---|---|---|
| committer | wodim | 2017-08-26 15:02:56 +0200 |
| commit | dbe8ef6dad916124c3714abc469403ed9991261c (patch) | |
| tree | bc5625e1bd114f6b428444481d5a5f8088daf2f1 /src/modules/pythoncore/pythonheaderwrapper.h | |
| parent | remove blank part of the splash img (diff) | |
| download | KVIrc-dbe8ef6dad916124c3714abc469403ed9991261c.tar.gz KVIrc-dbe8ef6dad916124c3714abc469403ed9991261c.tar.bz2 KVIrc-dbe8ef6dad916124c3714abc469403ed9991261c.zip | |
Add support for Python 3
Diffstat (limited to 'src/modules/pythoncore/pythonheaderwrapper.h')
| -rw-r--r-- | src/modules/pythoncore/pythonheaderwrapper.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/pythoncore/pythonheaderwrapper.h b/src/modules/pythoncore/pythonheaderwrapper.h index 47f60d361..2b34066c3 100644 --- a/src/modules/pythoncore/pythonheaderwrapper.h +++ b/src/modules/pythoncore/pythonheaderwrapper.h @@ -1,6 +1,12 @@ #ifndef _PYTHONHEADERWRAPPER_H_ #define _PYTHONHEADERWRAPPER_H_ +// As of Python 3, something inside <Python.h> defines a struct with a member +// called "slots" which conflicts with the builtin Qt keyword. But since we +// include stuff from KVIrc itself back into the python module, we can't just +// use QT_NO_KEYWORDS. +#undef slots + // See http://stackoverflow.com/questions/16200997/why-doesnt-include-python-h-work and http://stackoverflow.com/questions/19716859/puzzling-dependency-of-boost-python-1-54-debug-build-to-python27-lib-on-window #if defined(_DEBUG) && defined(_MSC_VER) |