diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
| commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
| tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /src/corelib/io/qstandardpaths_mac.mm | |
| parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
| parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'src/corelib/io/qstandardpaths_mac.mm')
| -rw-r--r-- | src/corelib/io/qstandardpaths_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm index 3bb7a7877a..11b5cc8c37 100644 --- a/src/corelib/io/qstandardpaths_mac.mm +++ b/src/corelib/io/qstandardpaths_mac.mm @@ -237,9 +237,9 @@ QString QStandardPaths::displayName(StandardLocation type) if (QStandardPaths::ApplicationsLocation == type) return QCoreApplication::translate("QStandardPaths", "Applications"); + const QCFString fsPath(standardLocations(type).constFirst()); if (QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, - standardLocations(type).constFirst().toCFString(), - kCFURLPOSIXPathStyle, true)) { + fsPath, kCFURLPOSIXPathStyle, true)) { QCFString name; CFURLCopyResourcePropertyForKey(url, kCFURLLocalizedNameKey, &name, NULL); if (name && CFStringGetLength(name)) |