diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-27 14:45:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-27 13:13:42 +0000 |
| commit | 85465e18ec12bc57008ca7e724f6d0928274c93d (patch) | |
| tree | 7d2cb1f6d4e726f9fc82f5193a8a79cfd04431d3 /src | |
| parent | e4d555219bb95732280eb42fb1e8d77da4ab8b96 (diff) | |
Remove handling of DIR_MEDIA_LIBS
DIR_MEDIA_LIBS was where ffmpegsumo was before 5.6 which removed it.
When we don't have the library it used to be in, we return the fallback
path, which by OverridePath will be created if it doesn't exits.
DIR_MEDIA_LIBS is not used anywhere by Chromium anymore, so remove the
code.
Task-number: QTBUG-54258
Change-Id: I1015bd3549c617916c06b633ba3e483ef855ff84
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/content_main_delegate_qt.cpp | 1 | ||||
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 29 |
2 files changed, 0 insertions, 30 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index e142436bc..709246210 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -115,7 +115,6 @@ bool ContentMainDelegateQt::BasicStartupComplete(int *exit_code) #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE PathService::Override(base::DIR_QT_LIBRARY_DATA, WebEngineLibraryInfo::getPath(base::DIR_QT_LIBRARY_DATA)); #endif - PathService::Override(content::DIR_MEDIA_LIBS, WebEngineLibraryInfo::getPath(content::DIR_MEDIA_LIBS)); PathService::Override(ui::DIR_LOCALES, WebEngineLibraryInfo::getPath(ui::DIR_LOCALES)); SetContentClient(new ContentClientQt); diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index cfe5556de..c38fa6eb5 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -151,33 +151,6 @@ QString subProcessPath() return processPath; } -QString pluginsPath() -{ -#if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) - static QString pluginsPath = getPath(frameworkBundle()) % QLatin1String("/Libraries"); -#else - static bool initialized = false; - static QString pluginsPath; - - if (!initialized) { - initialized = true; - const QStringList directories = QCoreApplication::libraryPaths(); - Q_FOREACH (const QString &dir, directories) { - const QString candidate = dir % "/" % QLatin1String("qtwebengine"); - if (QFileInfo::exists(candidate)) { - pluginsPath = candidate; - break; - } - } - - if (pluginsPath.isEmpty()) { - pluginsPath = fallbackDir(); - } - } -#endif - return pluginsPath; -} - QString localesPath() { #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) @@ -283,8 +256,6 @@ base::FilePath WebEngineLibraryInfo::getPath(int key) break; case base::DIR_QT_LIBRARY_DATA: return toFilePath(icuDataPath()); - case content::DIR_MEDIA_LIBS: - return toFilePath(pluginsPath()); case ui::DIR_LOCALES: return toFilePath(localesPath()); default: |