summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-10-30 14:10:31 +0100
committerLars Knoll <lars.knoll@qt.io>2020-11-04 11:21:41 +0100
commit419eaa0679c3867d8d9a3da8845a3015e29800d7 (patch)
treebf867e2c1dfcf1a53d750261c8da3016d4db5093 /tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
parent32a703e2779e697a9a7d75f6cbc6e555187d7fca (diff)
Cleanup QArrayDataOps::reallocate() and related
Don't use QArrayData::GrowsForward/Backward anymore and replace it with a simple 'bool grow'. Change-Id: Ifddfef3ae860b11dda4c40854c71ef2aeb29df34 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp')
-rw-r--r--tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 5910a29b43..f8d85a37e7 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -547,7 +547,8 @@ void tst_QArrayData::reallocate()
// now try to reallocate
int newCapacity = 40;
auto pair = QArrayData::reallocateUnaligned(data, dataPointer, objectSize, newCapacity,
- QArrayData::ArrayOptions(allocateOptions));
+ (allocateOptions & (QArrayData::GrowsBackwards|QArrayData::GrowsForward)) ?
+ QArrayData::Grow : QArrayData::KeepSize);
data = pair.first;
dataPointer = pair.second;
QVERIFY(data);