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 | |
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>
-rw-r--r-- | configure.json | 8 | ||||
-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 | ||||
-rw-r--r-- | src/core/core_generator.pro | 26 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 2 |
8 files changed, 35 insertions, 17 deletions
diff --git a/configure.json b/configure.json index 531a034e6..03b9611c1 100644 --- a/configure.json +++ b/configure.json @@ -9,6 +9,7 @@ "commandline": { "options": { "alsa": "boolean", + "pepper-plugins": "boolean", "printing-and-pdf": "boolean", "proprietary-codecs": "boolean", "pulseaudio": "boolean", @@ -55,6 +56,12 @@ "condition": "libs.pulseaudio", "output": [ "privateFeature" ] }, + "pepper-plugins": { + "label": "Pepper Plugins", + "autoDetect": "!features.cross_compile", + "purpose": "Enables use of Pepper Flash and Widevine plugins", + "output": [ "privateFeature" ] + }, "printing-and-pdf": { "label": "Printing and PDF", "condition": "module.printsupport && features.printer", @@ -89,6 +96,7 @@ { "section": "Qt WebEngine", "entries": [ + "pepper-plugins", "printing-and-pdf", "proprietary-codecs", "spellchecker", 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()}\"" diff --git a/src/core/core_generator.pro b/src/core/core_generator.pro index 15e27997a..e1e7ab1d9 100644 --- a/src/core/core_generator.pro +++ b/src/core/core_generator.pro @@ -82,15 +82,10 @@ SOURCES = \ render_view_observer_host_qt.cpp \ render_widget_host_view_qt.cpp \ renderer/content_renderer_client_qt.cpp \ - renderer/pepper/pepper_flash_renderer_host_qt.cpp \ - renderer/pepper/pepper_renderer_host_factory_qt.cpp \ renderer/render_frame_observer_qt.cpp \ renderer/render_view_observer_qt.cpp \ renderer/user_resource_controller.cpp \ renderer/web_channel_ipc_transport.cpp \ - renderer_host/pepper/pepper_flash_browser_host_qt.cpp \ - renderer_host/pepper/pepper_host_factory_qt.cpp \ - renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp \ renderer_host/resource_dispatcher_host_delegate_qt.cpp \ renderer_host/user_resource_controller_host.cpp \ renderer_host/web_channel_ipc_transport_host.cpp \ @@ -163,15 +158,10 @@ HEADERS = \ render_widget_host_view_qt.h \ render_widget_host_view_qt_delegate.h \ renderer/content_renderer_client_qt.h \ - renderer/pepper/pepper_flash_renderer_host_qt.h \ - renderer/pepper/pepper_renderer_host_factory_qt.h \ renderer/render_frame_observer_qt.h \ renderer/render_view_observer_qt.h \ renderer/user_resource_controller.h \ renderer/web_channel_ipc_transport.h \ - renderer_host/pepper/pepper_flash_browser_host_qt.h \ - renderer_host/pepper/pepper_host_factory_qt.h \ - renderer_host/pepper/pepper_isolated_file_system_message_filter.h \ renderer_host/resource_dispatcher_host_delegate_qt.h \ renderer_host/user_resource_controller_host.h \ renderer_host/web_channel_ipc_transport_host.h \ @@ -202,6 +192,22 @@ use?(pdf) { HEADERS += pdfium_document_wrapper_qt.h } +use?(pepper_plugins) { + SOURCES += \ + renderer_host/pepper/pepper_flash_browser_host_qt.cpp \ + renderer_host/pepper/pepper_host_factory_qt.cpp \ + renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp \ + renderer/pepper/pepper_flash_renderer_host_qt.cpp \ + renderer/pepper/pepper_renderer_host_factory_qt.cpp + + HEADERS += \ + renderer_host/pepper/pepper_flash_browser_host_qt.h \ + renderer_host/pepper/pepper_host_factory_qt.h \ + renderer_host/pepper/pepper_isolated_file_system_message_filter.h \ + renderer/pepper/pepper_flash_renderer_host_qt.h \ + renderer/pepper/pepper_renderer_host_factory_qt.h +} + use?(printing) { SOURCES += \ printing_message_filter_qt.cpp \ diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 3cdcc400b..759638877 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -23,6 +23,8 @@ defineTest(runConfigure) { isQtMinimum(5, 8) { include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) QT_FOR_CONFIG += webengine-private + + qtConfig(pepper-plugins): WEBENGINE_CONFIG += use_pepper_plugins qtConfig(printing-and-pdf): WEBENGINE_CONFIG += use_printing use_pdf qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker |