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

QLibrary: fix use of deprecated QByteArrayMatcher::indexIn(p, n)

Browse Source 
Use the QByteArrayView overload instead.

Deprecated since 6.3, so backporting:

Pick-to: 6.4 6.3
Change-Id: I529104cad59260eed371cedb1ae84a7e9086bbf6
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
This commit is contained in:
Marc Mutz 2022-04-30 14:08:45 +02:00
parent 1b8b802455
commit 4e66c69bad
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/plugin/qlibrary.cpp
View File

@ -188,7 +188,7 @@ static QLibraryScanResult qt_find_pattern(const char *s, qsizetype s_len, QStrin
static_assert(pattern == magic); static_assert(pattern == magic);
return qMakeStaticByteArrayMatcher(pattern); return qMakeStaticByteArrayMatcher(pattern);
}(); }();
qsizetype i = matcher.indexIn(s, s_len); qsizetype i = matcher.indexIn({s, s_len});
if (i < 0) { if (i < 0) {
*errMsg = QLibrary::tr("'%1' is not a Qt plugin").arg(*errMsg); *errMsg = QLibrary::tr("'%1' is not a Qt plugin").arg(*errMsg);
return QLibraryScanResult{}; return QLibraryScanResult{};