summaryrefslogtreecommitdiffstats
path: root/src/core/config
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-04 16:01:13 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-19 08:47:46 +0000
commit96f120fd9ec94befcf0cc510ef40a7730677c0ad (patch)
tree98dba04b8b89ca1a932190bfdcfe9684a94d7c2e /src/core/config
parent440fbed83646f16bf002749f7cecf6ad6fc59bbf (diff)
Enable Widevine CDM
Enable loading Google Chrome's Widevine pepper plugin. Flash and Widevine plugins will now also be searched for in the plugins/ppapi directory. Task-number: QTBUG-50132 Change-Id: I28fb56bb08d7e81629e34420be626621a7981181 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/config')
-rw-r--r--src/core/config/desktop_linux.pri1
-rw-r--r--src/core/config/mac_osx.pri3
-rw-r--r--src/core/config/windows.pri1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index f0bf6cb23..7e1d9b106 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -5,6 +5,7 @@ include(linux.pri)
GYP_CONFIG += \
desktop_linux=1 \
enable_plugins=1 \
+ enable_widevine=1
linux-clang: GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr
else: GYP_CONFIG += clang=0 host_clang=0
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 93c77623c..b1659985e 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -15,7 +15,8 @@ GYP_CONFIG += \
mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \
clang_use_chrome_plugins=0 \
- enable_plugins=1
+ enable_plugins=1 \
+ enable_widevine=1
QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)"
exists($$QMAKE_MAC_SDK_PATH): GYP_CONFIG += mac_sdk_path=\"$${QMAKE_MAC_SDK_PATH}\"
diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri
index 1e875f308..92e193422 100644
--- a/src/core/config/windows.pri
+++ b/src/core/config/windows.pri
@@ -4,6 +4,7 @@ GYP_CONFIG += \
disable_nacl=1 \
remoting=0 \
use_ash=0 \
+ enable_widevine=1
# Chromium builds with debug info in release by default but Qt doesn't
CONFIG(release, debug|release):!force_debug_info: GYP_CONFIG += fastbuild=1