summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_library_info.cpp
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-01-22 16:18:37 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-22 16:46:52 +0100
commit8a8ae0abc76315d9c4b29379040f24643ad66ebd (patch)
tree87cb837e39cd3b153f67198087882f1f919a0469 /src/core/web_engine_library_info.cpp
parent72dcef7294680226ffde88bb1837bd1e4364b809 (diff)
Fix html5 video
Deploy the built ffmpegsumo library and make chromium find it by overriding the content::DIR_MEDIA_LIBS path with the deploy location. We deploy the plugin to $$[QT_INSTALL_PLUGINS]/qtwebengine. Change-Id: I0aeb37fccd2af62b23f8e6405041655e1f66b7aa Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
-rw-r--r--src/core/web_engine_library_info.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index b996297ff..a6b7c5d8d 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -86,6 +86,12 @@ static QString location(QLibraryInfo::LibraryLocation path)
return QLibraryInfo::location(path);
}
+base::FilePath WebEngineLibraryInfo::pluginsPath()
+{
+ QString path = location(QLibraryInfo::PluginsPath) % QDir::separator() % QStringLiteral("qtwebengine");
+ return base::FilePath(toFilePathString(path));
+}
+
base::FilePath WebEngineLibraryInfo::subProcessPath()
{
static bool initialized = false;