Add support for std::vector and QVector matching the support for QList

Task-number: QTBUG-60133
Change-Id: I5497dc3c4a1c3922e7147d7a20593c75a0d9d0e9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 35 insertions, 3 deletions

diff --git a/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml b/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml
index 74c7cda9a3..c6732efc05 100644
--- a/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml
+++ b/tests/auto/qml/qqmlecmascript/data/sequenceSort.qml
@@ -52,7 +52,11 @@ Item {
     function doStringTest(stringList, fn) {
         var expected = createExpected(stringList, fn);
         var actual = msc.strings(stringList);
-        return checkResults(expected, actual, fn);
+        var actual2 = msc.stringsVector(stringList);
+        var actual3 = msc.stringsStdVector(stringList);
+        return checkResults(expected, actual, fn)
+        && checkResults(expected, actual2, fn)
+        && checkResults(expected, actual3, fn)
     }
     function doIntTest(intList, fn) {
         var expected = createExpected(intList, fn);
@@ -67,12 +71,16 @@ Item {
     function doIntVectorTest(intList, fn) {
         var expected = createExpected(intList, fn);
         var actual = msc.integerVector(intList);
-        return checkResults(expected, actual, fn);
+        var actual2 = msc.integerStdVector(intList);
+        return checkResults(expected, actual, fn)
+        && checkResults(expected, actual2, fn)
     }
     function doRealVectorTest(realList, fn) {
         var expected = createExpected(realList, fn);
         var actual = msc.realVector(realList);
-        return checkResults(expected, actual, fn);
+        var actual2 = msc.realStdVector(realList);
+        return checkResults(expected, actual, fn)
+        && checkResults(expected, actual2, fn)
     }
 
     function test_qtbug_25269(useCustomCompare) {
diff --git a/tests/auto/qml/qqmlecmascript/testtypes.cpp b/tests/auto/qml/qqmlecmascript/testtypes.cpp
index 63c2918325..c4692fdf31 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.cpp
+++ b/tests/auto/qml/qqmlecmascript/testtypes.cpp
@@ -283,6 +283,15 @@ public:
     {
         return stringList;
     }
+    Q_INVOKABLE QVector<QString> stringsVector(const QStringList& stringList) const
+    {
+        return stringList.toVector();
+    }
+    Q_INVOKABLE
+    std::vector<QString> stringsStdVector(const QStringList& stringList) const
+    {
+        return std::vector<QString>(stringList.begin(), stringList.end());
+    }
     Q_INVOKABLE QList<int> integers(QList<int> v) const
     {
         return v;
@@ -299,14 +308,29 @@ public:
     {
         return v;
     }
+    Q_INVOKABLE
+    std::vector<int> integerStdVector(std::vector<int> v) const
+    {
+        return v;
+    }
     Q_INVOKABLE QVector<qreal> realVector(QVector<qreal> v) const
     {
         return v;
     }
+    Q_INVOKABLE
+    std::vector<qreal> realStdVector(std::vector<qreal> v) const
+    {
+        return v;
+    }
     Q_INVOKABLE QVector<bool> boolVector(QVector<bool> v) const
     {
         return v;
     }
+    Q_INVOKABLE
+    std::vector<bool> boolStdVector(std::vector<bool> v) const
+    {
+        return v;
+    }
 };
 
 static MyInheritedQmlObject *theSingletonObject = 0;