diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/content_main_delegate_qt.cpp | 2 | ||||
-rw-r--r-- | src/core/web_engine_library_info.cpp | 30 |
2 files changed, 1 insertions, 31 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index dc32bb8c1..57f8af63c 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -226,9 +226,7 @@ static void SafeOverridePathImpl(const char *keyName, int key, const base::FileP bool ContentMainDelegateQt::BasicStartupComplete(int *exit_code) { SafeOverridePath(base::FILE_EXE, WebEngineLibraryInfo::getPath(base::FILE_EXE)); -#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE SafeOverridePath(base::DIR_QT_LIBRARY_DATA, WebEngineLibraryInfo::getPath(base::DIR_QT_LIBRARY_DATA)); -#endif SafeOverridePath(ui::DIR_LOCALES, WebEngineLibraryInfo::getPath(ui::DIR_LOCALES)); #if QT_CONFIG(webengine_spellchecker) SafeOverridePath(base::DIR_APP_DICTIONARIES, WebEngineLibraryInfo::getPath(base::DIR_APP_DICTIONARIES)); diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index 12ffd91e6..1c8316430 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -257,34 +257,6 @@ QString dictionariesPath() } #endif // QT_CONFIG(webengine_spellchecker) -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; -} - QString resourcesDataPath() { static bool initialized = false; @@ -341,7 +313,7 @@ base::FilePath WebEngineLibraryInfo::getPath(int key) directory = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); break; case base::DIR_QT_LIBRARY_DATA: - return toFilePath(icuDataPath()); + return toFilePath(resourcesDataPath()); case ui::DIR_LOCALES: return toFilePath(localesPath()); #if QT_CONFIG(webengine_spellchecker) |