diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:27 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 01:27:39 +0100 |
| commit | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (patch) | |
| tree | 897cf6bfb1814b0935982ff5975a6cbfb48d6d9e /src/corelib/kernel/qmetatype.h | |
| parent | 3d19422ef16a230bb11dbbfe4a8cc9667f39bf15 (diff) | |
| parent | 6c612c933803ef57ea45e907d0181b40659148ac (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: I89dc2e193bd01624c1fb50484610d516e39b1538
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 06ada136a6..8dc45bb2ed 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -255,7 +255,7 @@ public: static bool load(QDataStream &stream, int type, void *data); #endif - QMetaType(const int type); + explicit QMetaType(const int type); inline ~QMetaType(); inline bool isValid() const; @@ -494,6 +494,7 @@ inline int qMetaTypeId( #endif ) { + Q_STATIC_ASSERT_X(QMetaTypeId2<T>::Defined, "Type is not registered, please use Q_DECLARE_METATYPE macro to make it know to Qt's meta-object system"); return QMetaTypeId2<T>::qt_metatype_id(); } |