diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-19 01:00:40 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-19 01:00:41 +0200 |
commit | 8f0790dd90f3fcaefa1a74ca1ce9bce84064eb10 (patch) | |
tree | abc028924edde03ed173c2ba16e25daca38d7acd /src/corelib/tools | |
parent | 82aabafadad2010f0f20abeeb7234057e3c10e9f (diff) | |
parent | 69ef6e821287d324459336dd1292d19d272386b8 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I999ba23a27cd897017d15c6ffe41ea8cd008ffb9
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qvector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 65a5174abf..ebe6527d89 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -424,7 +424,7 @@ template <typename T> void QVector<T>::resize(int asize) { if (asize == d->size) - return; + return detach(); if (asize > int(d->alloc) || !isDetached()) { // there is not enough space QArrayData::AllocationOptions opt = asize > int(d->alloc) ? QArrayData::Grow : QArrayData::Default; realloc(qMax(int(d->alloc), asize), opt); |