diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-03-31 12:30:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-03-31 12:30:18 +0200 |
| commit | 947e1f45c762cf6d26bc8f241833689c6e636627 (patch) | |
| tree | b6e87bd19fc5b530da279476ea0eb8ad3d1e960f /src/corelib/text/qbytearray_p.h | |
| parent | 8f88a3962a7b1716d2c0482b818d2504776ece05 (diff) | |
| parent | d934fd7f54eae24ea3f719890e2c4dbbc445049d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
Change-Id: Ifaa56153f5f0d687a6b4d94f84fcfa1e1751afd2
Diffstat (limited to 'src/corelib/text/qbytearray_p.h')
| -rw-r--r-- | src/corelib/text/qbytearray_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/text/qbytearray_p.h b/src/corelib/text/qbytearray_p.h index 3c6257f786..ffec6dca22 100644 --- a/src/corelib/text/qbytearray_p.h +++ b/src/corelib/text/qbytearray_p.h @@ -56,10 +56,9 @@ QT_BEGIN_NAMESPACE -enum { - // Define as enum to force inlining. Don't expose MaxAllocSize in a public header. - MaxByteArraySize = MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPtr>::type) -}; +// -1 because of the terminating NUL +constexpr qsizetype MaxByteArraySize = MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPtr>::type) - 1; +constexpr qsizetype MaxStringSize = (MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPtr>::type)) / 2 - 1; QT_END_NAMESPACE |