diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 11:40:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-06 08:28:13 +0000 |
| commit | 1925b1afb30f119fa6c0733a36d83215b7bac8f7 (patch) | |
| tree | ea6c9b5baaa079ec4beba368ecdb4318cd7655fb /src/core/content_client_qt.cpp | |
| parent | 6252f0231f85e5f4e6b887a6814d4968acae13bd (diff) | |
Fix pepper cdms feature
Is now also buildflag and not command line define.
Change-Id: I3c687981928239f669bd285797b5ceee4e994822
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/content_client_qt.cpp')
| -rw-r--r-- | src/core/content_client_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 5d51f65aa..b10a02fbd 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -193,7 +193,7 @@ void AddPepperFlashFromCommandLine(std::vector<content::PepperPluginInfo>* plugi void AddPepperWidevine(std::vector<content::PepperPluginInfo>* plugins) { -#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && !defined(WIDEVINE_CDM_IS_COMPONENT) +#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && !defined(WIDEVINE_CDM_IS_COMPONENT) QStringList pluginPaths; const base::CommandLine::StringType widevine_argument = base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(switches::kPpapiWidevinePath); if (!widevine_argument.empty()) @@ -263,7 +263,7 @@ void AddPepperWidevine(std::vector<content::PepperPluginInfo>* plugins) plugins->push_back(widevine_cdm); } } -#endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && +#endif // defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && // !defined(WIDEVINE_CDM_IS_COMPONENT) } |