summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJocelyn Turcotte <jturcotte@woboq.com>2016-01-19 05:58:28 -0500
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-22 23:13:58 +0000
commitbf614638ed278a41573eb0987dd65f91a004e04a (patch)
tree9fed841fd8dd228a69c5c080a186724a006dd049 /src
parent4fa6a7a7c7e15a560bd8503fb5c0dc2e6d1024c1 (diff)
Add the Google Chrome path for pepper Flash on Linux
This is the path used when installing the official Chrome deb packages on Ubuntu. Change-Id: Iaa30c1df17ba2c6d069d17f828ecbbd26d16237b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/content_client_qt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index c8b23efab..3e5b96b41 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -118,7 +118,8 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins)
pluginPaths << "/Library/Internet Plug-Ins/PepperFlashPlayer/PepperFlashPlayer.plugin"; // Mac OS X
#endif
#if defined(Q_OS_LINUX)
- pluginPaths << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu
+ pluginPaths << "/opt/google/chrome/PepperFlash/libpepflashplayer.so" // Google Chrome
+ << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu
<< "/usr/lib/PepperFlash/libpepflashplayer.so" // Arch
<< "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE
#endif