diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-10 11:58:09 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-10 10:01:50 +0000 |
commit | e2a658a2472d9fa710c251a065f488bae981c0ae (patch) | |
tree | 69e081d1851b966c276cf6b89ed343b8fde4febb /src | |
parent | c3282aebf42918df2af34a48556b6b471b3e754f (diff) | |
download | qtserialport-e2a658a2472d9fa710c251a065f488bae981c0ae.tar.gz |
Replace QCFString::to(CF/NS/Q)String usage with QString methodsv5.8.0-beta1
Just follow 669add9 in qtbase.
Change-Id: I080d6272541bf8bd8a209ffbf257578aa6a57ae8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/serialport/qserialportinfo_osx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<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(); } |