summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobject_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/kernel/qobject_p.h')
-rw-r--r--src/corelib/kernel/qobject_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 2a5104c3dd..4a60d37191 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -548,8 +548,8 @@ public:
inline int id() const { return d.method_offset_ + d.method_relative_; }
inline const void * const* args() const { return d.args_; }
inline void ** args() { return d.args_; }
- inline const int *types() const { return reinterpret_cast<int*>(d.args_ + d.nargs_); }
- inline int *types() { return reinterpret_cast<int*>(d.args_ + d.nargs_); }
+ inline const QMetaType *types() const { return reinterpret_cast<QMetaType *>(d.args_ + d.nargs_); }
+ inline QMetaType *types() { return reinterpret_cast<QMetaType *>(d.args_ + d.nargs_); }
virtual void placeMetaCall(QObject *object) override;
@@ -565,7 +565,7 @@ private:
ushort method_relative_;
} d;
// preallocate enough space for three arguments
- char prealloc_[3*(sizeof(void*) + sizeof(int))];
+ alignas(void *) char prealloc_[3*sizeof(void*) + 3*sizeof(QMetaType)];
};
class QBoolBlocker