diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-07-19 02:11:24 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-22 21:13:24 +0000 |
| commit | e3d0ea7680bf610174358ad0eae26336059051fd (patch) | |
| tree | 9afe30c9077ed6c4d323f0b032c796141390228c /src/corelib/json/qjsonarray.h | |
| parent | b1b3083dec617b34484ce577db2b2d896905b370 (diff) | |
qjsonarray: Remove a copy-ctor in Qt6
Makes the class trivially-copyable
Change-Id: I5b8ebadf351b65344f7ee30f0e7211738fdf54e4
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/json/qjsonarray.h')
| -rw-r--r-- | src/corelib/json/qjsonarray.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonarray.h b/src/corelib/json/qjsonarray.h index 311753d977..611e1f4193 100644 --- a/src/corelib/json/qjsonarray.h +++ b/src/corelib/json/qjsonarray.h @@ -154,7 +154,9 @@ public: inline const_iterator() : a(Q_NULLPTR), i(0) { } explicit inline const_iterator(const QJsonArray *array, int index) : a(array), i(index) { } - inline const_iterator(const const_iterator &o) : a(o.a), i(o.i) {} +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + inline const_iterator(const const_iterator &o) : a(o.a), i(o.i) {} // ### Qt 6: Removed so class can be trivially-copyable +#endif inline const_iterator(const iterator &o) : a(o.a), i(o.i) {} inline QJsonValue operator*() const { return a->at(i); } |