diff options
| author | Viktor Engelmann <viktor.engelmann@qt.io> | 2016-10-26 13:49:06 +0200 |
|---|---|---|
| committer | Viktor Engelmann <viktor.engelmann@qt.io> | 2016-11-03 11:59:08 +0000 |
| commit | 6bb3d98e47d89790049edca796843345b8fd3c8b (patch) | |
| tree | c0fdfc4c03e86ff2f55553e1bfafb53c7e73ee97 /src | |
| parent | a4b04e4c2613cb600680eea5697b2775a765147b (diff) | |
Pepper flash search-path for package adobe-flashplugin
Since version 54, the chromium distribution package does not contain
the pepper flash plugin anymore. Because of this, the plugin cannot
be installed using the Ubuntu package "pepperflashplugin-nonfree"
anymore (because the package pulled the plugin from the chromium
distribution).
The plugin is also contained in the package adobe-flashplugin, which
installs the file to /usr/lib/adobe-flashplugin/libpepflashplayer.so.
[ChangeLog] Pepper flash is now also searched in /usr/lib/adobe-flashplugin/
Change-Id: I7c135a2eac1628b0d338bbfed07695c9578458e6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/content_client_qt.cpp | 3 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-features.qdoc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index c10911b0b..c12abefc5 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -119,7 +119,8 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) #endif #if defined(Q_OS_LINUX) pluginPaths << "/opt/google/chrome/PepperFlash/libpepflashplayer.so" // Google Chrome - << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu + << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu, package pepperflashplugin-nonfree + << "/usr/lib/adobe-flashplugin/libpepflashplayer.so" // Ubuntu, package adobe-flashplugin << "/usr/lib/PepperFlash/libpepflashplayer.so" // Arch << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE #endif diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc index 912e83b59..815ffd097 100644 --- a/src/webengine/doc/src/qtwebengine-features.qdoc +++ b/src/webengine/doc/src/qtwebengine-features.qdoc @@ -151,6 +151,7 @@ \li Linux \code /usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so + /usr/lib/adobe-flashplugin/libpepflashplayer.so /usr/lib/PepperFlash/libpepflashplayer.so /usr/lib64/chromium/PepperFlash/libpepflashplayer.so \endcode |