Commit 6bb3d98e authored by Viktor Engelmann's avatar Viktor Engelmann
Browse files

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: default avatarAllan Sandfeld Jensen <allan.jensen@qt.io>
Showing with 3 additions and 1 deletion
...@@ -119,7 +119,8 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) ...@@ -119,7 +119,8 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins)
#endif #endif
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
pluginPaths << "/opt/google/chrome/PepperFlash/libpepflashplayer.so" // Google Chrome 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/lib/PepperFlash/libpepflashplayer.so" // Arch
<< "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE
#endif #endif
......
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
\li Linux \li Linux
\code \code
/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so /usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so
/usr/lib/adobe-flashplugin/libpepflashplayer.so
/usr/lib/PepperFlash/libpepflashplayer.so /usr/lib/PepperFlash/libpepflashplayer.so
/usr/lib64/chromium/PepperFlash/libpepflashplayer.so /usr/lib64/chromium/PepperFlash/libpepflashplayer.so
\endcode \endcode
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment