1 files changed, 88 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index 1207986dde..dd9371fbe1 100644
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -76,6 +76,13 @@ struct Movable {
         return i == other.i;
     }
 
+    bool operator<(const Movable &other) const
+    {
+        check(state, Constructed);
+        check(other.state, Constructed);
+        return i < other.i;
+    }
+
     Movable &operator=(const Movable &other)
     {
         check(state, Constructed);
@@ -144,6 +151,13 @@ struct Optimal
         return i == other.i;
     }
 
+    bool operator<(const Optimal &other) const
+    {
+        check(state, Constructed);
+        check(other.state, Constructed);
+        return i < other.i;
+    }
+
     Optimal &operator=(const Optimal &other)
     {
         check(state, Constructed);
@@ -220,6 +234,12 @@ struct Complex
         return value == other.value;
     }
 
+    bool operator<(Complex const &other) const
+    {
+        check(); other.check();
+        return value < other.value;
+    }
+
     void check() const
     {
         QVERIFY(this == checkSum);
@@ -329,6 +349,9 @@ private slots:
     void replaceOptimal() const;
     void replaceMovable() const;
     void replaceComplex() const;
+    void reverseIteratorsOptimal() const;
+    void reverseIteratorsMovable() const;
+    void reverseIteratorsComplex() const;
     void startsWithOptimal() const;
     void startsWithMovable() const;
     void startsWithComplex() const;
@@ -376,6 +399,9 @@ private slots:
     void eraseValidIteratorsOnSharedList() const;
     void insertWithValidIteratorsOnSharedList() const;
 
+    void qhashOptimal() const { qhash<Optimal>(); }
+    void qhashMovable() const { qhash<Movable>(); }
+    void qhashComplex() const { qhash<Complex>(); }
     void reserve() const;
 private:
     template<typename T> void length() const;
@@ -392,10 +418,12 @@ private:
     template<typename T> void endsWith() const;
     template<typename T> void lastIndexOf() const;
     template<typename T> void move() const;
+    template<typename T> void qhash() const;
     template<typename T> void removeAll() const;
     template<typename T> void removeAt() const;
     template<typename T> void removeOne() const;
     template<typename T> void replace() const;
+    template<typename T> void reverseIterators() const;
     template<typename T> void startsWith() const;
     template<typename T> void swap() const;
     template<typename T> void takeAt() const;
@@ -1220,6 +1248,43 @@ void tst_QList::replaceComplex() const
 }
 
 template<typename T>
+void tst_QList::reverseIterators() const
+{
+    QList<T> v;
+    v << T_CAT << T_DOG << T_BLAH << T_BAZ;
+    QList<T> vr = v;
+    std::reverse(vr.begin(), vr.end());
+    const QList<T> &cvr = vr;
+    QVERIFY(std::equal(v.begin(), v.end(), vr.rbegin()));
+    QVERIFY(std::equal(v.begin(), v.end(), vr.crbegin()));
+    QVERIFY(std::equal(v.begin(), v.end(), cvr.rbegin()));
+    QVERIFY(std::equal(vr.rbegin(), vr.rend(), v.begin()));
+    QVERIFY(std::equal(vr.crbegin(), vr.crend(), v.begin()));
+    QVERIFY(std::equal(cvr.rbegin(), cvr.rend(), v.begin()));
+}
+
+void tst_QList::reverseIteratorsOptimal() const
+{
+    const int liveCount = Optimal::getLiveCount();
+    reverseIterators<Optimal>();
+    QCOMPARE(liveCount, Optimal::getLiveCount());
+}
+
+void tst_QList::reverseIteratorsMovable() const
+{
+    const int liveCount = Movable::getLiveCount();
+    reverseIterators<Movable>();
+    QCOMPARE(liveCount, Movable::getLiveCount());
+}
+
+void tst_QList::reverseIteratorsComplex() const
+{
+    const int liveCount = Complex::getLiveCount();
+    reverseIterators<Complex>();
+    QCOMPARE(liveCount, Complex::getLiveCount());
+}
+
+template<typename T>
 void tst_QList::startsWith() const
 {
     QList<T> list;
@@ -1576,6 +1641,19 @@ void tst_QList::testOperators() const
     // []
     QCOMPARE(list[0], T_FOO);
     QCOMPARE(list[list.size() - 1], T_CAT);
+
+    // <, >, <=, >=
+    QVERIFY(!(list <  listtwo));
+    QVERIFY(!(list >  listtwo));
+    QVERIFY(  list <= listtwo);
+    QVERIFY(  list >= listtwo);
+    listtwo.push_back(T_CAT);
+    QVERIFY(  list <  listtwo);
+    QVERIFY(!(list >  listtwo));
+    QVERIFY(  list <= listtwo);
+    QVERIFY(!(list >= listtwo));
+    QVERIFY(listtwo >  list);
+    QVERIFY(listtwo >= list);
 }
 
 void tst_QList::testOperatorsOptimal() const
@@ -1834,6 +1912,16 @@ void tst_QList::insertWithValidIteratorsOnSharedList() const
     QCOMPARE(a.at(1), 15);
 }
 
+template <typename T>
+void tst_QList::qhash() const
+{
+    QList<T> l1, l2;
+    QCOMPARE(qHash(l1), qHash(l2));
+    l1 << T_BAR;
+    l2 << T_BAR;
+    QCOMPARE(qHash(l1), qHash(l2));
+}
+
 void tst_QList::reserve() const
 {
     // Note: