diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-15 17:09:43 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-15 17:09:57 +0200 |
commit | 23902340662f1ef6f5dafe68a34b593aed6ea497 (patch) | |
tree | a23914cc8ebd77faade5e3b16f8ee4830f257175 | |
parent | 66be7f7263e6d0e3a788dbdbb90e80ccc82851f6 (diff) | |
parent | e2a658a2472d9fa710c251a065f488bae981c0ae (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I96ee91aacae9d2768238dd3368771c26c3e02709
-rw-r--r-- | src/serialport/qserialportinfo_osx.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/serialport/qserialportinfo_osx.cpp b/src/serialport/qserialportinfo_osx.cpp index 03cb59b7..2e46397c 100644 --- a/src/serialport/qserialportinfo_osx.cpp +++ b/src/serialport/qserialportinfo_osx.cpp @@ -73,7 +73,7 @@ static QString searchStringProperty(io_registry_entry_t ioRegistryEntry, const QCFType<CFTypeRef> result(searchProperty(ioRegistryEntry, propertyKey)); const CFStringRef ref = result.as<CFStringRef>(); if (ref && (::CFGetTypeID(ref) == ::CFStringGetTypeID())) - return QCFString::toQString(ref); + return QString::fromCFString(ref); return QString(); } @@ -102,42 +102,42 @@ static bool isCompleteInfo(const QSerialPortInfoPrivate &priv, const QString &ca static QString calloutDeviceSystemLocation(io_registry_entry_t ioRegistryEntry) { - return searchStringProperty(ioRegistryEntry, QCFString(kIOCalloutDeviceKey)); + return searchStringProperty(ioRegistryEntry, QCFString(CFSTR(kIOCalloutDeviceKey))); } static QString dialinDeviceSystemLocation(io_registry_entry_t ioRegistryEntry) { - return searchStringProperty(ioRegistryEntry, QCFString(kIODialinDeviceKey)); + return searchStringProperty(ioRegistryEntry, QCFString(CFSTR(kIODialinDeviceKey))); } static QString deviceDescription(io_registry_entry_t ioRegistryEntry) { - QString result = searchStringProperty(ioRegistryEntry, QCFString(kIOPropertyProductNameKey)); + QString result = searchStringProperty(ioRegistryEntry, QCFString(CFSTR(kIOPropertyProductNameKey))); if (result.isEmpty()) - result = searchStringProperty(ioRegistryEntry, QCFString(kUSBProductString)); + result = searchStringProperty(ioRegistryEntry, QCFString(CFSTR(kUSBProductString))); if (result.isEmpty()) - result = searchStringProperty(ioRegistryEntry, QCFString("BTName")); + result = searchStringProperty(ioRegistryEntry, QCFString(CFSTR("BTName"))); return result; } static QString deviceManufacturer(io_registry_entry_t ioRegistryEntry) { - return searchStringProperty(ioRegistryEntry, QCFString(kUSBVendorString)); + return searchStringProperty(ioRegistryEntry, QCFString(CFSTR(kUSBVendorString))); } static QString deviceSerialNumber(io_registry_entry_t ioRegistryEntry) { - return searchStringProperty(ioRegistryEntry, QCFString(kUSBSerialNumberString)); + return searchStringProperty(ioRegistryEntry, QCFString(CFSTR(kUSBSerialNumberString))); } static quint16 deviceVendorIdentifier(io_registry_entry_t ioRegistryEntry, bool &ok) { - return searchShortIntProperty(ioRegistryEntry, QCFString(kUSBVendorID), ok); + return searchShortIntProperty(ioRegistryEntry, QCFString(CFSTR(kUSBVendorID)), ok); } static quint16 deviceProductIdentifier(io_registry_entry_t ioRegistryEntry, bool &ok) { - return searchShortIntProperty(ioRegistryEntry, QCFString(kUSBProductID), ok); + return searchShortIntProperty(ioRegistryEntry, QCFString(CFSTR(kUSBProductID)), ok); } static io_registry_entry_t parentSerialPortService(io_registry_entry_t currentSerialPortService) |