From 8c09a2306e2f16a5f9d47371f36f80d5e7bc8f1e Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Thu, 10 Mar 2016 10:44:43 +0100
Subject: 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>
---
 src/core/content_client_qt.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/core/content_client_qt.cpp')

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));
     }
 }
 
-- 
cgit v1.2.3