whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on macOS without warning after QString::count deprecation 

Pick-to: 6.3
Change-Id: Ie043289c258fadbfafaf4a88b9695f0e65699de8
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
bb10
Volker Hilsheimer 2022-03-20 13:28:40 +01:00
parent b96c212360
commit 75ea5a0335
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/text/qcollator_macx.cpp
View File

@ -130,12 +130,12 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
// Documentation recommends having it 5 times as big as the input
QList<UCCollationValue> ret(string.size() * 5);
ItemCount actualSize;
int status = UCGetCollationKey(d->collator, text, string.count(),
int status = UCGetCollationKey(d->collator, text, string.size(),
ret.size(), &actualSize, ret.data());
ret.resize(actualSize + 1);
if (status == kUCOutputBufferTooSmall) {
status = UCGetCollationKey(d->collator, text, string.count(),
status = UCGetCollationKey(d->collator, text, string.size(),
ret.size(), &actualSize, ret.data());
Q_ASSERT(status != kUCOutputBufferTooSmall);
Q_ASSERT(ret.size() == qsizetype(actualSize + 1));