diff options
| author | Keith Kyzivat <keith.kyzivat@qt.io> | 2020-10-29 15:16:28 -0400 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-05 12:38:57 +0000 |
| commit | 92719afc80d4e62b9bc444cf52ccf853223304f2 (patch) | |
| tree | 83119913689531615681f0c274040aa65e245938 | |
| parent | c9727f9153e4ae2f3612aa8eeff3449f344c3b2e (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: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 3a4e3c807c667491e133d04e3dcbadd0dad19826)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 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 |