diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2011-11-23 15:03:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-25 01:12:14 +0100 |
| commit | 66b659c8a4a429b483b66fd1a1d1429a2c0d3b4a (patch) | |
| tree | c654cac67ca5d6cc2cbd2d41d03b83f5011dc0c3 /src/corelib/kernel/qobject_p.h | |
| parent | 583c55b243d9894d93d32fbe15bece2a9beb1d10 (diff) | |
Add support for QueuedConnection when connecting using the new syntax
QMetaCallEvent now can handle a pointer to QSlotObjectBase
Change-Id: I94da1e68ce9bb1fd96a9ae013a389552eb625faa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobject_p.h')
| -rw-r--r-- | src/corelib/kernel/qobject_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 72cf5a8cca..5519a69c34 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -264,6 +264,9 @@ class Q_CORE_EXPORT QMetaCallEvent : public QEvent public: QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction , const QObject *sender, int signalId, int nargs = 0, int *types = 0, void **args = 0, QSemaphore *semaphore = 0); + QMetaCallEvent(QObject::QSlotObjectBase *slotObj, const QObject *sender, int signalId, + int nargs = 0, int *types = 0, void **args = 0, QSemaphore *semaphore = 0); + ~QMetaCallEvent(); inline int id() const { return method_offset_ + method_relative_; } @@ -274,6 +277,7 @@ public: virtual void placeMetaCall(QObject *object); private: + QObject::QSlotObjectBase *slotObj_; const QObject *sender_; int signalId_; int nargs_; |