Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: If9fd98525b6b4ca07e5e006fc98bf372a73b8a21

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index 449fefbaa2..719daad3b6 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -840,6 +840,7 @@ void tst_QVarLengthArray::initializeList()
     T val3(101);
     T val4(114);
 
+    // QVarLengthArray(std::initializer_list<>)
     QVarLengthArray<T> v1 {val1, val2, val3};
     QCOMPARE(v1, QVarLengthArray<T>() << val1 << val2 << val3);
     QCOMPARE(v1, (QVarLengthArray<T> {val1, val2, val3}));
@@ -851,6 +852,25 @@ void tst_QVarLengthArray::initializeList()
 
     QVarLengthArray<T> v4({});
     QCOMPARE(v4.size(), 0);
+
+    // operator=(std::initializer_list<>)
+
+    QVarLengthArray<T> v5({val2, val1});
+    v1 = { val1, val2 }; // make array smaller
+    v4 = { val1, val2 }; // make array bigger
+    v5 = { val1, val2 }; // same size
+    QCOMPARE(v1, QVarLengthArray<T>() << val1 << val2);
+    QCOMPARE(v4, v1);
+    QCOMPARE(v5, v1);
+
+    QVarLengthArray<T, 1> v6 = { val1 };
+    v6 = { val1, val2 }; // force allocation on heap
+    QCOMPARE(v6.size(), 2);
+    QCOMPARE(v6.first(), val1);
+    QCOMPARE(v6.last(), val2);
+
+    v6 = {}; // assign empty
+    QCOMPARE(v6.size(), 0);
 #else
     QSKIP("This tests requires a compiler that supports initializer lists.");
 #endif