From 82ddecfb17158c35de1d0740dd7ecd5562d41726 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 3 May 2019 11:53:18 +0200
Subject: Deprecate {to,from}Std{List,Vector}

ask our users to use the range constructors instead. This will allow
us to remove the include dependency towards <list> and <vector> in
Qt 6.

Change-Id: Id90f2058432e19941de1fa847100a7920432ad71
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/tools/qvector/tst_qvector.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'tests/auto/corelib/tools/qvector/tst_qvector.cpp')

diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 172b03a445..f81ce11510 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -257,7 +257,6 @@ private slots:
     void fromListInt() const;
     void fromListMovable() const;
     void fromListCustom() const;
-    void fromStdVector() const;
     void indexOf() const;
     void insertInt() const;
     void insertMovable() const;
@@ -296,7 +295,10 @@ private slots:
     void swapMovable() const;
     void swapCustom() const;
     void toList() const;
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+    void fromStdVector() const;
     void toStdVector() const;
+#endif
     void value() const;
 
     void testOperators() const;
@@ -1426,6 +1428,7 @@ void tst_QVector::fromListCustom() const
     QCOMPARE(instancesCount, Custom::counter.loadAcquire());
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 void tst_QVector::fromStdVector() const
 {
     // stl = :(
@@ -1439,6 +1442,7 @@ void tst_QVector::fromStdVector() const
     // test it converts ok
     QCOMPARE(myvec, QVector<QString>() << "aaa" << "bbb" << "ninjas" << "pirates");
 }
+#endif
 
 void tst_QVector::indexOf() const
 {
@@ -2331,6 +2335,7 @@ void tst_QVector::toList() const
     QCOMPARE(myvec, QVector<QString>() << "A" << "B" << "C");
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 void tst_QVector::toStdVector() const
 {
     QVector<QString> myvec;
@@ -2343,6 +2348,7 @@ void tst_QVector::toStdVector() const
 
     QCOMPARE(myvec, QVector<QString>() << "A" << "B" << "C");
 }
+#endif
 
 void tst_QVector::value() const
 {
-- 
cgit v1.2.3