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.
42 lines
1.9 KiB
42 lines
1.9 KiB
From 99294d646e58bcbedc5987a1816fed592290566f Mon Sep 17 00:00:00 2001
|
|
From: Helio Chissini de Castro <helio@kde.org>
|
|
Date: Wed, 31 May 2017 15:16:56 +0200
|
|
Subject: [PATCH] qtwebengine-opensource-src-5.9.0-no-icudtl-dat
|
|
|
|
---
|
|
src/core/web_engine_library_info.cpp | 17 -----------------
|
|
1 file changed, 17 deletions(-)
|
|
|
|
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
|
|
index f46f8f425..96cd48ac4 100644
|
|
--- a/src/core/web_engine_library_info.cpp
|
|
+++ b/src/core/web_engine_library_info.cpp
|
|
@@ -254,24 +254,7 @@ QString icuDataPath()
|
|
#if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
|
|
return getResourcesPath(frameworkBundle());
|
|
#else
|
|
- static bool initialized = false;
|
|
static QString potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
|
|
- 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;
|
|
#endif
|
|
}
|
|
--
|
|
2.13.0
|
|
|