Blame qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch

635c36
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
635c36
--- qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp.no-icudtl-dat	2018-06-14 09:23:48.931195271 -0500
635c36
+++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_library_info.cpp	2018-06-14 09:27:26.248014325 -0500
635c36
@@ -258,28 +258,12 @@ QString dictionariesPath()
635c36
 
635c36
 QString icuDataPath()
635c36
 {
635c36
-    static bool initialized = false;
635c36
     static QString potentialResourcesPath =
Kevin Kofler 4f844a
 #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
635c36
             getResourcesPath(frameworkBundle());
Kevin Kofler 4f844a
 #else
635c36
             QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
635c36
 #endif
Kevin Kofler 4f844a
-    if (!initialized) {
Kevin Kofler 4f844a
-        initialized = true;
Kevin Kofler 4f844a
-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
Kevin Kofler 4f844a
-            qWarning("Qt WebEngine ICU data not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath));
Kevin Kofler 4f844a
-            potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath);
Kevin Kofler 4f844a
-        }
Kevin Kofler 4f844a
-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
Kevin Kofler 4f844a
-            qWarning("Qt WebEngine ICU data not found at %s. Trying application directory...", qPrintable(potentialResourcesPath));
Kevin Kofler 4f844a
-            potentialResourcesPath = QCoreApplication::applicationDirPath();
Kevin Kofler 4f844a
-        }
Kevin Kofler 4f844a
-        if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/icudtl.dat"))) {
Kevin Kofler 4f844a
-            qWarning("Qt WebEngine ICU data not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath));
Kevin Kofler 4f844a
-            potentialResourcesPath = fallbackDir();
Kevin Kofler 4f844a
-        }
Kevin Kofler 4f844a
-    }
635c36
 
Kevin Kofler 4f844a
     return potentialResourcesPath;
Kevin Kofler 4f844a
 }