summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/text/qbytearray.h2
-rw-r--r--src/corelib/text/qstring.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
index f98313a1f0..7162c6cdcb 100644
--- a/src/corelib/text/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
@@ -532,7 +532,7 @@ inline void QByteArray::reserve(qsizetype asize)
inline void QByteArray::squeeze()
{
- if ((d->flags() & Data::CapacityReserved) == 0)
+ if (!d.isMutable())
return;
if (d->needsDetach() || size() < capacity()) {
reallocData(size(), d->detachFlags() & ~Data::CapacityReserved);
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index f4e58e38b2..fc3a0431ff 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1166,9 +1166,9 @@ inline void QString::reserve(qsizetype asize)
inline void QString::squeeze()
{
- if ((d->flags() & Data::CapacityReserved) == 0)
+ if (!d.isMutable())
return;
- if (d->needsDetach() || d.size < capacity()) {
+ if (d->needsDetach() || size() < capacity()) {
reallocData(d.size, d->detachFlags() & ~Data::CapacityReserved);
} else {
d->clearFlag(Data::CapacityReserved);