1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning on macOS builds, unbreak -developer-build

Browse Source 
The mix of signed (qsizetype) and unsigned long when comparing breaks
local -Werror,-Wsign-compare builds.

Amends d83dbc3db2f305e745cd75a9fd9c97128eaac42f.

Change-Id: I7910b7e2dfaaa01d8069ce52e97c0166e6d3fa30
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Volker Hilsheimer 2022-01-14 00:20:56 +01:00
parent 1ee875dcac
commit 7955dceec1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
status = UCGetCollationKey(d->collator, text, string.count(),
ret.size(), &actualSize, ret.data());
Q_ASSERT(status != kUCOutputBufferTooSmall);
Q_ASSERT(ret.size() == actualSize + 1);
Q_ASSERT(ret.size() == qsizetype(actualSize + 1));
}
ret[actualSize] = 0;
return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret)));