diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2016-02-25 15:08:32 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2016-08-03 11:49:28 +0000 |
| commit | d7132c6c6d3bb9d1362744f36b2995b1d2daf4fe (patch) | |
| tree | 700717e7724d32ef1e76ef3665a45c943090be3c /src/corelib/kernel/qmetatype.h | |
| parent | 958bc5793fba3011ce20d24047d87466b0a008ea (diff) | |
Add std::nullptr_t as builtin type in QMetaType
Change-Id: If6c484bc89a2610c6a9e3e7bd54ef85ef40a783f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
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 a36d247c3c..9abeefa8d8 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -86,6 +86,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(); F(UChar, 37, uchar) \ F(Float, 38, float) \ F(SChar, 40, signed char) \ + F(Nullptr, 51, std::nullptr_t) \ #define QT_FOR_EACH_STATIC_PRIMITIVE_POINTER(F)\ F(VoidStar, 31, void*) \ @@ -414,7 +415,7 @@ public: QT_FOR_EACH_STATIC_TYPE(QT_DEFINE_METATYPE_ID) FirstCoreType = Bool, - LastCoreType = QPersistentModelIndex, + LastCoreType = Nullptr, FirstGuiType = QFont, LastGuiType = QPolygonF, FirstWidgetsType = QSizePolicy, |