diff options
| author | Keith Kyzivat <keith.kyzivat@qt.io> | 2020-10-29 15:16:28 -0400 |
|---|---|---|
| committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2020-11-25 19:29:08 +0000 |
| commit | 4a381fdd5fa37ecd29c4a1999bbc3e0de0f635e1 (patch) | |
| tree | cf47427b36f62d645fd9df6e5d4cec010f5c080b | |
| parent | fda31ac6feae28b76e8cc4855cad87816fa27569 (diff) | |
Look for resources in macOS standard Resources dir
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: Kirill Burtsev <kirill.burtsev@qt.io>
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index fa9e34268..99369e57f 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -275,6 +275,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 |