diff options
| -rw-r--r-- | configure.json | 10 | ||||
| -rw-r--r-- | src/core/config/common.pri | 9 | ||||
| -rw-r--r-- | src/core/config/embedded_linux.pri | 1 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 1 |
4 files changed, 19 insertions, 2 deletions
diff --git a/configure.json b/configure.json index fd89230b6..c91c2e6bf 100644 --- a/configure.json +++ b/configure.json @@ -14,7 +14,8 @@ "printing-and-pdf": "boolean", "proprietary-codecs": "boolean", "pulseaudio": "boolean", - "spellchecker": "boolean" + "spellchecker": "boolean", + "webrtc": "boolean" } }, @@ -92,6 +93,12 @@ "purpose": "Enables the use of Chromium's spellchecker", "output": [ "privateFeature" ] }, + "webrtc": { + "label": "WebRTC", + "autoDetect": "!features.embedded", + "purpose": "Enables WebRTC support", + "output": [ "privateFeature" ] + }, "system-ninja": { "label": "Using system ninja", "condition": "tests.ninja", @@ -114,6 +121,7 @@ "printing-and-pdf", "proprietary-codecs", "spellchecker", + "webrtc", "system-ninja", { "type": "feature", diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 7cdf34623..7307c4a46 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -35,6 +35,12 @@ use?(gn) { gn_args += enable_spellcheck=false } + use?(webrtc) { + gn_args += enable_webrtc=true + } else { + gn_args += enable_webrtc=false + } + } else { # Trigger Qt-specific build conditions. GYP_CONFIG += use_qt=1 @@ -68,3 +74,6 @@ use?(gn) { GYP_CONFIG += enable_plugins=0 enable_widevine=0 } } + +use?(webrtc): GYP_CONFIG += enable_webrtc=1 +else: GYP_CONFIG += enable_webrtc=0 diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 08c8c1661..c9de47562 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -18,7 +18,6 @@ GYP_CONFIG += \ enable_session_service=0 \ enable_task_manager=0 \ enable_themes=0 \ - enable_webrtc=0 \ gtest_target_type=none \ host_clang=0 \ notifications=0 \ diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index c0eead57c..48a1eb263 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -28,6 +28,7 @@ defineTest(runConfigure) { qtConfig(printing-and-pdf): WEBENGINE_CONFIG += use_printing use_pdf qtConfig(proprietary-codecs): WEBENGINE_CONFIG += use_proprietary_codecs qtConfig(spellchecker): WEBENGINE_CONFIG += use_spellchecker + qtConfig(webrtc): WEBENGINE_CONFIG += use_webrtc qtConfig(embedded): WEBENGINE_CONFIG += embedded_build } else { cross_compile: WEBENGINE_CONFIG += embedded_build |