diff options
| author | Christian Tismer <ctismer@gmail.com> | 2015-06-17 00:37:04 +0200 |
|---|---|---|
| committer | Christian Tismer <ctismer@gmail.com> | 2015-06-17 00:37:04 +0200 |
| commit | 2111490331aa0b48466d80bdc96ebb3d0c6057fa (patch) | |
| tree | ad208a622bbfce34533763c217d07f321460d513 /PySide/global.h.in | |
| parent | 00fdb90110accf3f0c5be58d49a1b2a1c9f967cd (diff) | |
still hacking on the basics: QObject was changed - the worst possible condition for my tasks :-(
I will anyway try to keep to the schedule, and work on the things with the biggest impact.
Actually that means: Ignore the incompatible signal layout and simply give a message.
We need time to do this right -- any short-thinking attempt is a bad idea.
Diffstat (limited to 'PySide/global.h.in')
| -rw-r--r-- | PySide/global.h.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/PySide/global.h.in b/PySide/global.h.in index 3535eec9..e11d1149 100644 --- a/PySide/global.h.in +++ b/PySide/global.h.in @@ -137,6 +137,8 @@ inline void qYouForgotTheQ_OBJECT_Macro(T1, T2) {} # define Q_DECL_HIDDEN_STATIC_METACALL Q_DECL_HIDDEN #endif +// from the qt5 qobjectdefs.h, but needed to exclude +#if false /* qmake ignore Q_OBJECT */ #define Q_OBJECT \ public: \ @@ -150,6 +152,8 @@ private: \ Q_DECL_HIDDEN_STATIC_METACALL static void qt_static_metacall(QObject *, QMetaObject::Call, int, void **); \ struct QPrivateSignal {}; +#endif + /* qmake ignore Q_OBJECT */ #define Q_OBJECT_FAKE Q_OBJECT |