diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-27 08:35:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-27 08:35:45 +0100 |
| commit | 8c57e8c012d1045f2bdb30d376625a32c33fdfc4 (patch) | |
| tree | 33cdd83e82fd59aa4b750f3e2dda3c445cd37abf /src/corelib/io | |
| parent | b13801fd550d4eef2e45ac3e11304571e0146dd9 (diff) | |
| parent | c83eefff976a5f2cd673f6b4a95922b13855dd29 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/network/socket/qnativesocketengine_p.h
src/network/ssl/qsslsocket_mac.cpp
src/network/ssl/qsslsocket_mac_p.h
src/widgets/kernel/qwidget.cpp
Change-Id: I39592cb37d710dfaf8640769ba3c1b637927d7f4
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qstandardpaths_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths_mac.mm b/src/corelib/io/qstandardpaths_mac.mm index d6126ce1c3..7b97a03db2 100644 --- a/src/corelib/io/qstandardpaths_mac.mm +++ b/src/corelib/io/qstandardpaths_mac.mm @@ -204,7 +204,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) CFRelease(bundleUrl); CFURLRef resourcesUrl = CFBundleCopyResourcesDirectoryURL(mainBundle); - CFStringRef cfResourcesPath = CFURLCopyPath(bundleUrl); + CFStringRef cfResourcesPath = CFURLCopyPath(resourcesUrl); QString resourcesPath = QCFString::toQString(cfResourcesPath); CFRelease(cfResourcesPath); CFRelease(resourcesUrl); |