diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-27 13:31:28 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:11:12 +0200 |
| commit | df6a041af245ae32fe3bb0664c4f98a787c9e8ca (patch) | |
| tree | f3a4d933702e2e357a958034db27051475ef06ad | |
| parent | f88c9a9691a8603fa23092b56532e1ad2a914d18 (diff) | |
| download | qtwebengine-chromium-df6a041af245ae32fe3bb0664c4f98a787c9e8ca.tar.gz | |
<chromium> Blacklist the skypebuttons plugin
Even though plugins are disabled it happens that the libraries are
loaded and cause a crash since skypebuttons pulls Qt4 with it on
Linux and creates a dynamic linking error conflicting with Qt5
symbols.
Add the plugin library name to the blacklist to avoid it being
loaded altogether.
We have a similar fix in QtWebKit doing the same thing.
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Change-Id: I45abf31c4e94a8b61aff85765a91436dabae1b2e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/content/common/plugin_list_posix.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chromium/content/common/plugin_list_posix.cc b/chromium/content/common/plugin_list_posix.cc index acd7830f738..0e822767c02 100644 --- a/chromium/content/common/plugin_list_posix.cc +++ b/chromium/content/common/plugin_list_posix.cc @@ -151,6 +151,7 @@ bool IsUndesirablePlugin(const WebPluginInfo& info) { // http://code.google.com/p/chromium/issues/detail?id=38229 bool IsBlacklistedPlugin(const base::FilePath& path) { const char* kBlackListedPlugins[] = { + "skypebuttons.so", // Crash on dlopen since it uses Qt4 "nppdf.so", // Adobe PDF }; std::string filename = path.BaseName().value(); |