diff options
| author | Keith Kyzivat <keith.kyzivat@qt.io> | 2020-10-29 15:16:28 -0400 |
|---|---|---|
| committer | Keith Kyzivat <keith.kyzivat@qt.io> | 2020-11-04 10:46:45 -0400 |
| commit | 3a4e3c807c667491e133d04e3dcbadd0dad19826 (patch) | |
| tree | 9e1ce9b33889ee9f1b9b7c9b96d0aec4216a30e9 /src/core/web_engine_library_info.cpp | |
| parent | 004826a247f62e3e052d3ce0e8466993642d2d98 (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).
Pick-to: 5.15 5.12
Task-number: QTBUG-72368
Change-Id: I2106a50a63c6d812dc6ad649645e3b6b9e0471e2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
| -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 aa3dd7bdc..b91398fea 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::path(QLibraryInfo::DataPath) % QLatin1String("/resources"); #endif |