diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-03-10 10:44:43 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-03-10 12:49:39 +0000 |
| commit | 8c09a2306e2f16a5f9d47371f36f80d5e7bc8f1e (patch) | |
| tree | 8a8e645faec0a4a5dda4c36e70baa1c7f6dde203 /src/core/content_client_qt.cpp | |
| parent | 6380f626cb0b30b2cea0b8704c0cb3a7dc22b78e (diff) | |
Flash: Support --ppapi-flash-version argument also for system Flash
Task-number: QTBUG-51774
Change-Id: I609cfbd9304a396ab57c1479c7f4d3be8a379b94
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/content_client_qt.cpp')
| -rw-r--r-- | src/core/content_client_qt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 3e5b96b41..c10911b0b 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -123,10 +123,11 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) << "/usr/lib/PepperFlash/libpepflashplayer.so" // Arch << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE #endif + std::string flash_version = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kPpapiFlashVersion); for (auto it = pluginPaths.constBegin(); it != pluginPaths.constEnd(); ++it) { if (!QFile::exists(*it)) continue; - plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), std::string())); + plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), flash_version)); } } |