Blame qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch

Kevin Kofler c81512
diff -ur qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp qtwebengine-opensource-src-5.6.0-no-icudtl-dat/src/core/web_engine_library_info.cpp
Kevin Kofler c81512
--- qtwebengine-opensource-src-5.6.0/src/core/web_engine_library_info.cpp	2016-03-03 17:02:28.000000000 +0100
Kevin Kofler c81512
+++ qtwebengine-opensource-src-5.6.0-no-icudtl-dat/src/core/web_engine_library_info.cpp	2016-03-18 03:08:24.385444415 +0100
Kevin Kofler c81512
@@ -207,24 +207,7 @@
Kevin Kofler 4f844a
 #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
Kevin Kofler 4f844a
     return getResourcesPath(frameworkBundle());
Kevin Kofler 4f844a
 #else
Kevin Kofler 4f844a
-    static bool initialized = false;
Kevin Kofler 4f844a
     static QString potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
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
-    }
Kevin Kofler 4f844a
-
Kevin Kofler 4f844a
     return potentialResourcesPath;
Kevin Kofler 4f844a
 #endif
Kevin Kofler 4f844a
 }