diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-01-07 16:00:13 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-01-07 16:03:02 +0000 |
| commit | 44dda5d0bd66e222f96cae8524e3c71ce86fea29 (patch) | |
| tree | 5c03f55a6f65e7bf7ce457f1ccd1aab7b359ca50 /src/core/content_client_qt.cpp | |
| parent | e9041a8bbdfafc5d4a299a776638f643b2577d07 (diff) | |
Enable loading of Flash plugin on Windows 64 bit
The pepper plugin is available on 64 bit in
C:\Windows\System32\Macromed
Also do not give up after finding a candidate file
(because it might be the wrong bitness).
Change-Id: I70af34fbcabeec792e8c74d8010476477c6e91dc
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, 1 insertions, 2 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 1d4923c70..6a76ed6cf 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -106,7 +106,7 @@ content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path, cons void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) { QStringList pluginPaths; -#if defined(Q_OS_WIN) && defined(Q_PROCESSOR_X86_32) +#if defined(Q_OS_WIN) QString winDir = QDir::fromNativeSeparators(qgetenv("WINDIR")); if (winDir.isEmpty()) winDir = QString::fromLatin1("C:/Windows"); @@ -133,7 +133,6 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) if (!QFile(*it).exists()) continue; plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), std::string())); - return; } } |