aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/libpyside
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-05-31 13:13:59 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-02 10:51:14 +0000
commit3b139f40a074b764696f6d23da08d7732bd0b255 (patch)
tree9b84489f71097d2026564add21ecfcff0e2b93cd /sources/pyside2/libpyside
parent7573f0f7b5f23303124c93026fe2af8800d8f6d2 (diff)
libpyside: Use Q_SLOTS instead of slots
When mixing Python and C++, Qt needs to be used with 'CONFIG += no_keywords' to suppress the 'slots' macro definition, which clashes with a Python header. Task-number: PYSIDE-526 Change-Id: I4feeae2de21db712b4de6653e243d556623436a1 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/libpyside')
-rw-r--r--sources/pyside2/libpyside/destroylistener.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/libpyside/destroylistener.h b/sources/pyside2/libpyside/destroylistener.h
index c4aa5549..c4dd28ae 100644
--- a/sources/pyside2/libpyside/destroylistener.h
+++ b/sources/pyside2/libpyside/destroylistener.h
@@ -56,7 +56,7 @@ class PYSIDE_API DestroyListener : public QObject
static void destroy();
void listen(QObject* obj);
- public slots:
+ public Q_SLOTS:
void onObjectDestroyed(QObject* obj);
private: