c07c2d5a52
Amends 8e5ce9cd369230256045864d6fad38dbd8bee413, which introduced the QtPrivate::equalStrings() call. At that time, equalStrings() had already required equal lengths (see 1560e0161af70b5cf88a70e55c0b502612d433cd), so no excuse. [ChangeLog][QtCore][QCborMap and QJsonObject] Fixed bug that could result in a crash or failing to find a entry in the map/object with non- ASCII keys. Manual conflict resolution for 6.9: - Port from keyView() to key(), because the former is a 6.10+ feature. Fixes: QTBUG-133744 Change-Id: I6b0f8b0a2e47d3ef905afffda6c4c079814a0914 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 54daec43a041cb69cff31cbfd1dd0b7127e8ba87) (cherry picked from commit 8e94b67ba11fecfee134950eaae5c5b29812e82c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit d4a90a3f3013eae4e837fbd2df63d5803f19608a)