diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-01-22 16:18:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 16:46:52 +0100 |
| commit | 8a8ae0abc76315d9c4b29379040f24643ad66ebd (patch) | |
| tree | 87cb837e39cd3b153f67198087882f1f919a0469 /src/core/content_main_delegate_qt.cpp | |
| parent | 72dcef7294680226ffde88bb1837bd1e4364b809 (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/content_main_delegate_qt.cpp')
| -rw-r--r-- | src/core/content_main_delegate_qt.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index a8e5386de..20bedc039 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -42,6 +42,7 @@ #include "content_main_delegate_qt.h" #include "base/path_service.h" +#include "content/public/common/content_paths.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_paths.h" #include "ui/base/resource/resource_bundle.h" @@ -63,6 +64,7 @@ static base::StringPiece PlatformResourceProvider(int key) { void ContentMainDelegateQt::PreSandboxStartup() { PathService::Override(base::FILE_EXE, WebEngineLibraryInfo::subProcessPath()); + PathService::Override(content::DIR_MEDIA_LIBS, WebEngineLibraryInfo::pluginsPath()); PathService::Override(ui::DIR_LOCALES, WebEngineLibraryInfo::localesPath()); net::NetModule::SetResourceProvider(PlatformResourceProvider); |