You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.8 KiB
33 lines
1.8 KiB
5 years ago
|
diff -up qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp
|
||
|
|
--- qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat 2018-06-14 09:23:48.931195271 -0500
|
||
|
|
+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp 2018-06-14 09:27:26.248014325 -0500
|
||
|
|
@@ -258,28 +258,12 @@ QString dictionariesPath()
|
||
|
|
|
||
|
|
QString icuDataPath()
|
||
|
|
{
|
||
|
|
- static bool initialized = false;
|
||
|
|
static QString potentialResourcesPath =
|
||
|
|
#if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
|
||
|
|
getResourcesPath(frameworkBundle());
|
||
|
|
#else
|
||
|
|
QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
|
||
|
|
#endif
|
||
|
|
- if (!initialized) {
|
||
|
|
- initialized = true;
|
||
|
|
- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
|
||
|
|
- qWarning("Qt WebEngine ICU data not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
|
||
|
|
- potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath);
|
||
|
|
- }
|
||
|
|
- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
|
||
|
|
- qWarning("Qt WebEngine ICU data not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
|
||
|
|
- potentialResourcesPath = QCoreApplication::applicationDirPath();
|
||
|
|
- }
|
||
|
|
- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
|
||
|
|
- qWarning("Qt WebEngine ICU data not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
|
||
|
|
- potentialResourcesPath = fallbackDir();
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
|
||
|
|
return potentialResourcesPath;
|
||
|
|
}
|