AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QJsonObject: Fix operator<=()

Browse Source 
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>
This commit is contained in:
Ulf Hermann 2021-02-17 11:11:28 +01:00
parent 09fc4f9525
commit a2e23bca0f
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/serialization/qjsonobject.h
View File

@ -153,7 +153,7 @@ public:
bool operator<(const iterator& other) const 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 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); }
bool operator>=(const iterator& other) const { return !(*this < other); } bool operator>=(const iterator& other) const { return !(*this < other); }

31
tests/auto/corelib/serialization/json/tst_qtjson.cpp
View File

@ -170,6 +170,8 @@ private Q_SLOTS:
void fromToVariantConversions_data(); void fromToVariantConversions_data();
void fromToVariantConversions(); void fromToVariantConversions();
void testIteratorComparison();
private: private:
QString testDataDir; QString testDataDir;
}; };
@ -3520,5 +3522,34 @@ void tst_QtJson::fromToVariantConversions()
} }
} }
void tst_QtJson::testIteratorComparison()
{
QJsonObject t = QJsonObject::fromVariantHash({
{ QStringLiteral("a"), QVariant(12) },
{ QStringLiteral("b"), QVariant(13) }
});
QVERIFY(t.begin() == t.begin());
QVERIFY(t.begin() <= t.begin());
QVERIFY(t.begin() >= t.begin());
QVERIFY(!(t.begin() != t.begin()));
QVERIFY(!(t.begin() < t.begin()));
QVERIFY(!(t.begin() > t.begin()));
QVERIFY(!(t.begin() == t.end()));
QVERIFY(t.begin() <= t.end());
QVERIFY(!(t.begin() >= t.end()));
QVERIFY(t.begin() != t.end());
QVERIFY(t.begin() < t.end());
QVERIFY(!(t.begin() > t.end()));
QVERIFY(!(t.end() == t.begin()));
QVERIFY(!(t.end() <= t.begin()));
QVERIFY(t.end() >= t.begin());
QVERIFY(t.end() != t.begin());
QVERIFY(!(t.end() < t.begin()));
QVERIFY(t.end() > t.begin());
}
QTEST_MAIN(tst_QtJson) QTEST_MAIN(tst_QtJson)
#include "tst_qtjson.moc" #include "tst_qtjson.moc"