dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore deprecated QString::fromUtf16()

Browse Source
This commit is contained in:
Jonas Kvinge
2020-12-24 15:23:35 +01:00
parent 057ec49a3e
commit fa0fd6b7d0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/macosdevicelister.mm
View File

@@ -591,7 +591,11 @@ void MacOsDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) {
// The device actually returned something. That's a good sign. // The device actually returned something. That's a good sign.
// Because this was designed by MS, the characters are in UTF-16 (LE?). // Because this was designed by MS, the characters are in UTF-16 (LE?).
// FIXME
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
QString str = QString::fromUtf16(reinterpret_cast<ushort*>(data.data() + 2), (data.size() / 2) - 2); QString str = QString::fromUtf16(reinterpret_cast<ushort*>(data.data() + 2), (data.size() / 2) - 2);
#pragma GCC diagnostic pop
if (str.startsWith("MSFT100")) { if (str.startsWith("MSFT100")) {
// We got the OS descriptor! // We got the OS descriptor!