Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/gui/image/qpnghandler.cpp

Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301

1 files changed, 19 insertions, 2 deletions

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index fa2098c757..835fea0c77 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -535,8 +535,25 @@ static QString getRelocatablePrefix()
 #if defined(QT_STATIC)
     prefixPath = prefixFromAppDirHelper();
 #elif defined(Q_OS_DARWIN) && QT_CONFIG(framework)
-    CFBundleRef qtCoreBundle = CFBundleGetBundleWithIdentifier(
-            CFSTR("org.qt-project.QtCore"));
+    auto qtCoreBundle = CFBundleGetBundleWithIdentifier(CFSTR("org.qt-project.QtCore"));
+    if (!qtCoreBundle) {
+        // When running Qt apps over Samba shares, CoreFoundation will fail to find
+        // the Resources directory inside the bundle, This directory is a symlink,
+        // and CF relies on readdir() and dtent.dt_type to detect symlinks, which
+        // does not work reliably for Samba shares. We work around it by manually
+        // looking for the QtCore bundle.
+        auto allBundles = CFBundleGetAllBundles();
+        auto bundleCount = CFArrayGetCount(allBundles);
+        for (int i = 0; i < bundleCount; ++i) {
+            auto bundle = CFBundleRef(CFArrayGetValueAtIndex(allBundles, i));
+            auto url = QCFType<CFURLRef>(CFBundleCopyBundleURL(bundle));
+            auto path = QCFType<CFStringRef>(CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle));
+            if (CFStringHasSuffix(path, CFSTR("/QtCore.framework"))) {
+                qtCoreBundle = bundle;
+                break;
+            }
+        }
+    }
     Q_ASSERT(qtCoreBundle);
 
     QCFType<CFURLRef> qtCorePath = CFBundleCopyBundleURL(qtCoreBundle);