summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-09-24 16:38:27 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2020-09-30 10:10:57 +0200
commitba465f00edf361693b675229aa1dc7cee973fa81 (patch)
tree80f08147b05bc41964cd470027a9ec9ef079b284 /src
parent8572f8446763116e4c28c6906c914e2d9b269147 (diff)
QList: Remove CapacityReserved on squeeze
Even if we don't reallocate or detach. Change-Id: I44928c261f037b304de8ee6135b96f00dd217c51 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qlist.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 3f621e71fb..f93b60d4bb 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -528,6 +528,9 @@ inline void QList<T>::squeeze()
detached->copyAppend(constBegin(), constEnd());
}
d.swap(detached);
+ } else {
+ // We're detached so this is fine
+ d->clearFlag(Data::CapacityReserved);
}
}