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 /configure.json | |
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 'configure.json')
-rw-r--r-- | configure.json | 8 |
1 files changed, 8 insertions, 0 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", |