From fa0fd6b7d0cdf4f328e460fa26340dc40a56f44e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 24 Dec 2020 15:23:35 +0100 Subject: [PATCH] Ignore deprecated QString::fromUtf16() --- src/device/macosdevicelister.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/device/macosdevicelister.mm b/src/device/macosdevicelister.mm index 9627f3944..1b1d3133c 100644 --- a/src/device/macosdevicelister.mm +++ b/src/device/macosdevicelister.mm @@ -591,7 +591,11 @@ void MacOsDeviceLister::USBDeviceAddedCallback(void* refcon, io_iterator_t it) { // The device actually returned something. That's a good sign. // 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(data.data() + 2), (data.size() / 2) - 2); +#pragma GCC diagnostic pop if (str.startsWith("MSFT100")) { // We got the OS descriptor!