diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 21:58:32 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 08:48:52 +0000 |
commit | 3e58e15c3d95a7ca0786c837dd9c0d93c93ae562 (patch) | |
tree | 08179db8d5779d619189b571d1d403ee1dcbcc1e | |
parent | 8b94ceaff8e67827302a1190ad828cb90cf3b977 (diff) |
QJsonPrivate::q_littleendian: mark as primitive/movable, depending on T
Inherit the type-classification from the underlying type.
This amends commit 4889269ff0fb37130b332863e82dd7c19564116c,
which introduced a QVector<QJsonPrivate::offset>, but failed
to mark the payload as primitive.
Change-Id: I525a0456a550e0694b33b36b4aa71475aeac192b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
-rw-r--r-- | src/corelib/json/qjson_p.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/json/qjson_p.h b/src/corelib/json/qjson_p.h index 1767b3e9e6..0b3f517990 100644 --- a/src/corelib/json/qjson_p.h +++ b/src/corelib/json/qjson_p.h @@ -144,6 +144,13 @@ public: return *this; } }; +} // namespace QJsonPrivate + +template <typename T> +class QTypeInfo<QJsonPrivate::q_littleendian<T> > + : public QTypeInfoMerger<QJsonPrivate::q_littleendian<T>, T> {}; + +namespace QJsonPrivate { typedef q_littleendian<short> qle_short; typedef q_littleendian<unsigned short> qle_ushort; |