From 7bb17d185d9f2b4b9c1a1c1637b85f78b21c2835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 25 Sep 2020 15:39:01 +0200 Subject: QList: don't detach on squeeze when holding raw data To match QString and QByteArray behavior Change-Id: Ifce4a5dee6fc9077e855a24499f11f911e359cf5 Reviewed-by: Andrei Golubev Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 2 ++ tests/auto/corelib/tools/qlist/tst_qlist.cpp | 3 +++ 2 files changed, 5 insertions(+) (limited to 'tests') diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 27d4fd87d6..288bc6e120 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -1870,6 +1870,8 @@ void tst_QArrayData::literals() QCOMPARE(l.capacity(), 0); for (int i = 0; i < 3; ++i) QCOMPARE(l.at(i).value, i); + l.squeeze(); // shouldn't detach + QCOMPARE(l.capacity(), 0); (void)l.begin(); // "detach" diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp index 8a7100d14c..d1e321f4db 100644 --- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp +++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp @@ -3076,6 +3076,9 @@ void tst_QList::fromReadOnlyData() const { { QVector d = QVector::fromReadOnlyData("ABCDEFGHIJ"); + QCOMPARE(d.capacity(), 0); + d.squeeze(); + QCOMPARE(d.capacity(), 0); QCOMPARE(d.size(), 10u + 1u); for (int i = 0; i < 10; ++i) QCOMPARE(d.data()[i], char('A' + i)); -- cgit v1.2.3