diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-31 13:13:59 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-02 10:51:14 +0000 |
| commit | 3b139f40a074b764696f6d23da08d7732bd0b255 (patch) | |
| tree | 9b84489f71097d2026564add21ecfcff0e2b93cd /sources | |
| parent | 7573f0f7b5f23303124c93026fe2af8800d8f6d2 (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')
| -rw-r--r-- | sources/pyside2/libpyside/destroylistener.h | 2 | ||||
| -rw-r--r-- | sources/pyside2/tests/pysidetest/hiddenobject.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/destroylistener.h b/sources/pyside2/libpyside/destroylistener.h index c4aa55494..c4dd28aec 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: diff --git a/sources/pyside2/tests/pysidetest/hiddenobject.h b/sources/pyside2/tests/pysidetest/hiddenobject.h index ba96cec9c..b5e3c8e0b 100644 --- a/sources/pyside2/tests/pysidetest/hiddenobject.h +++ b/sources/pyside2/tests/pysidetest/hiddenobject.h @@ -42,7 +42,7 @@ class HiddenObject : public QObject public: HiddenObject() : m_called(false) {} Q_INVOKABLE void callMe(); -public slots: +public Q_SLOTS: bool wasCalled(); private: bool m_called; |