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. Pick-to: 6.8 Fixes: QTBUG-133744 Change-Id: I6b0f8b0a2e47d3ef905afffda6c4c079814a0914 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 54daec43a041cb69cff31cbfd1dd0b7127e8ba87)
…
…
Description
Languages
C++
84.3%
HTML
4.9%
C
3.9%
CMake
3.6%
Objective-C++
2%
Other
0.8%