From 92719afc80d4e62b9bc444cf52ccf853223304f2 Mon Sep 17 00:00:00 2001 From: Keith Kyzivat Date: Thu, 29 Oct 2020 15:16:28 -0400 Subject: Look for resources in macOS standard Resources dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When on macOS, with a frameworkless build, WebEngine resources are stored in a Resources directory named with a capital R. This is the standard directory name for resources on macOS, however Qt WebEngine was expecting to find resources in a directory named `resources` (no capitalized first letter). Task-number: QTBUG-72368 Change-Id: I2106a50a63c6d812dc6ad649645e3b6b9e0471e2 Reviewed-by: Michael Brüning (cherry picked from commit 3a4e3c807c667491e133d04e3dcbadd0dad19826) Reviewed-by: Qt Cherry-pick Bot --- src/core/web_engine_library_info.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index 3899ced25..75fd947a2 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -290,6 +290,8 @@ QString resourcesDataPath() static QString potentialResourcesPath = #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) getResourcesPath(frameworkBundle()); +#elif defined(OS_MACOSX) + QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/Resources"); #else QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources"); #endif -- cgit v1.2.3