From e2a658a2472d9fa710c251a065f488bae981c0ae Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 10 Oct 2016 11:58:09 +0200 Subject: Replace QCFString::to(CF/NS/Q)String usage with QString methods Just follow 669add9 in qtbase. Change-Id: I080d6272541bf8bd8a209ffbf257578aa6a57ae8 Reviewed-by: Simon Hausmann --- src/serialport/qserialportinfo_osx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/serialport/qserialportinfo_osx.cpp b/src/serialport/qserialportinfo_osx.cpp index cecb3a2..2e46397 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 result(searchProperty(ioRegistryEntry, propertyKey)); const CFStringRef ref = result.as(); if (ref && (::CFGetTypeID(ref) == ::CFStringGetTypeID())) - return QCFString::toQString(ref); + return QString::fromCFString(ref); return QString(); } -- cgit v1.2.1