diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-01-12 11:13:39 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-01-16 14:10:36 +0000 |
| commit | 48c30124e0a3082d09a1e08e6d7a3bd8c4a69b83 (patch) | |
| tree | bf064427f7bcee1b8a4ef1b7e59192c87abf34ab /src/core/config | |
| parent | 7cbd4ebf240ea720b70851fd40945291d69add16 (diff) | |
Add pepper-plugins feature to new configure system
Task-number: QTBUG-57731
Task-number: QTBUG-58108
Change-Id: I253dab52361afd411dcf545fab752836c19ee3c7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 6 | ||||
| -rw-r--r-- | src/core/config/desktop_linux.pri | 3 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 1 | ||||
| -rw-r--r-- | src/core/config/mac_osx.pri | 3 | ||||
| -rw-r--r-- | src/core/config/windows.pri | 3 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index b125cff93..f822ab7cc 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -25,3 +25,9 @@ use?(pdf) { } else { GYP_CONFIG += enable_pdf=0 } + +use?(pepper_plugins) { + GYP_CONFIG += enable_plugins=1 enable_widevine=1 +} else { + GYP_CONFIG += enable_plugins=0 enable_widevine=0 +} diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 2a39f7aee..92491fc1c 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -3,8 +3,7 @@ GYP_ARGS += "-D qt_os=\"desktop_linux\"" include(linux.pri) GYP_CONFIG += \ - desktop_linux=1 \ - enable_widevine=1 + desktop_linux=1 clang { GYP_CONFIG += werror= diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index e390a158f..08c8c1661 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -15,7 +15,6 @@ GYP_CONFIG += \ enable_language_detection=0 \ enable_managed_users=0 \ enable_plugin_installation=0 \ - enable_plugins=0 \ enable_session_service=0 \ enable_task_manager=0 \ enable_themes=0 \ diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index 17f200449..dfc8d840b 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -24,8 +24,7 @@ GYP_CONFIG += \ mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \ - clang_use_chrome_plugins=0 \ - enable_widevine=1 + clang_use_chrome_plugins=0 # Force touch API is used in 49-based Chromium, which is included starting with 10.10.3 SDK, so we # disable the API usage if the SDK version is lower. diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri index 51b83ac04..334675481 100644 --- a/src/core/config/windows.pri +++ b/src/core/config/windows.pri @@ -5,8 +5,7 @@ include(common.pri) GYP_CONFIG += \ disable_nacl=1 \ remoting=0 \ - use_ash=0 \ - enable_widevine=1 + use_ash=0 # Libvpx build needs additional search path on Windows. GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$${getChromiumSrcDir()}\"" |