diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-17 11:11:28 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-18 11:22:51 +0000 |
| commit | a2e23bca0f2b43a26e2e489f83cfe2e521da63b9 (patch) | |
| tree | 1ec2672a5887889b120796d5e7f50659460faa8a /src | |
| parent | 09fc4f9525740b8c671c036413153d3419750b99 (diff) | |
QJsonObject: Fix operator<=()
We had a copy-paste error there.
Pick-to: 6.0 6.1
Change-Id: Ib1448197ac4f4641c6559f133f41dcf326f210f1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/serialization/qjsonobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index 1e6cc65227..e477345643 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -153,7 +153,7 @@ public: bool operator<(const iterator& other) const { Q_ASSERT(item.o == other.item.o); return item.index < other.item.index; } bool operator<=(const iterator& other) const - { Q_ASSERT(item.o == other.item.o); return item.index < other.item.index; } + { Q_ASSERT(item.o == other.item.o); return item.index <= other.item.index; } bool operator>(const iterator& other) const { return !(*this <= other); } bool operator>=(const iterator& other) const { return !(*this < other); } |