diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-04 21:36:46 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2019-12-07 14:18:04 +0100 |
| commit | 64db4861bfcacc8849e8452b73d5c940d97aefd0 (patch) | |
| tree | c39991072737ea1253adf5affb321ca7f4923f79 /src/corelib/text/qstringliteral.h | |
| parent | bf0b4f332a2f1ec9860c610d98cd27e483869bec (diff) | |
Replace QArrayData::capacityReserved with a full flags field
Instead of stealing one bit from the alloc field, let's use a full
32-bit for the flags. The first flag to be in the field is the
CapacityReserved (even though the allocate() function will store some
others there, not relevant for now).
This is done in preparation for the need for more flags necessary
anyway.
Change-Id: I4c997d14743495e0d4558a6fb0a6042eb3d4975d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/text/qstringliteral.h')
| -rw-r--r-- | src/corelib/text/qstringliteral.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qstringliteral.h b/src/corelib/text/qstringliteral.h index 2a7e607c63..b407bf6bc0 100644 --- a/src/corelib/text/qstringliteral.h +++ b/src/corelib/text/qstringliteral.h @@ -75,7 +75,7 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2, /**/ #define Q_STATIC_STRING_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \ - { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \ + { Q_REFCOUNT_INITIALIZE_STATIC, QArrayData::DefaultAllocationFlags, size, 0, offset } \ /**/ #define Q_STATIC_STRING_DATA_HEADER_INITIALIZER(size) \ |