1 files changed, 54 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 69da6e450e..3f95fa18f6 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -86,6 +86,8 @@ private:
     }
 };
 
+inline uint qHash(const Movable &key, uint seed = 0) { return qHash(key.i, seed); }
+
 QAtomicInt Movable::counter = 0;
 QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(Movable, Q_MOVABLE_TYPE);
@@ -123,6 +125,13 @@ struct Custom {
         return i == other.i;
     }
 
+    bool operator<(const Custom &other) const
+    {
+        check(&other);
+        check(this);
+        return i < other.i;
+    }
+
     Custom &operator=(const Custom &other)
     {
         check(&other);
@@ -148,6 +157,8 @@ private:
 };
 QAtomicInt Custom::counter = 0;
 
+inline uint qHash(const Custom &key, uint seed = 0) { return qHash(key.i, seed); }
+
 Q_DECLARE_METATYPE(Custom);
 
 // tests depends on the fact that:
@@ -230,6 +241,9 @@ private slots:
     void prependInt() const;
     void prependMovable() const;
     void prependCustom() const;
+    void qhashInt() const { qhash<int>(); }
+    void qhashMovable() const { qhash<Movable>(); }
+    void qhashCustom() const { qhash<Custom>(); }
     void removeInt() const;
     void removeMovable() const;
     void removeCustom() const;
@@ -241,6 +255,7 @@ private slots:
     void resizeComplex_data() const;
     void resizeComplex() const;
     void resizeCtorAndDtor() const;
+    void reverseIterators() const;
     void sizeInt() const;
     void sizeMovable() const;
     void sizeCustom() const;
@@ -294,6 +309,7 @@ private:
     template<typename T> void fill() const;
     template<typename T> void fromList() const;
     template<typename T> void insert() const;
+    template<typename T> void qhash() const;
     template<typename T> void prepend() const;
     template<typename T> void remove() const;
     template<typename T> void size() const;
@@ -1437,6 +1453,16 @@ void tst_QVector::mid() const
     QCOMPARE(list.mid(4), QVector<QString>() << "buck" << "hello" << "kitty");
 }
 
+template <typename T>
+void tst_QVector::qhash() const
+{
+    QVector<T> l1, l2;
+    QCOMPARE(qHash(l1), qHash(l2));
+    l1 << SimpleValue<T>::at(0);
+    l2 << SimpleValue<T>::at(0);
+    QCOMPARE(qHash(l1), qHash(l2));
+}
+
 template<typename T>
 void tst_QVector::prepend() const
 {
@@ -1907,6 +1933,21 @@ void tst_QVector::resizeCtorAndDtor() const
     QCOMPARE(Custom::counter.loadAcquire(), items);
 }
 
+void tst_QVector::reverseIterators() const
+{
+    QVector<int> v;
+    v << 1 << 2 << 3 << 4;
+    QVector<int> vr = v;
+    std::reverse(vr.begin(), vr.end());
+    const QVector<int> &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()));
+}
+
 template<typename T>
 void tst_QVector::size() const
 {
@@ -2076,6 +2117,19 @@ void tst_QVector::testOperators() const
     // ==
     QVERIFY(myvec == combined);
 
+    // <, >, <=, >=
+    QVERIFY(!(myvec <  combined));
+    QVERIFY(!(myvec >  combined));
+    QVERIFY(  myvec <= combined);
+    QVERIFY(  myvec >= combined);
+    combined.push_back("G");
+    QVERIFY(  myvec <  combined);
+    QVERIFY(!(myvec >  combined));
+    QVERIFY(  myvec <= combined);
+    QVERIFY(!(myvec >= combined));
+    QVERIFY(combined >  myvec);
+    QVERIFY(combined >= myvec);
+
     // []
     QCOMPARE(myvec[0], QLatin1String("A"));
     QCOMPARE(myvec[1], QLatin1String("B"));