Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: Ib2a1eb4dfae2fb5a98066d3d0f8f09f4e1d61d3f

1 files changed, 34 insertions, 0 deletions

diff --git a/configure.json b/configure.json
new file mode 100644
index 000000000..63abd1dba
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,34 @@
+{
+    "module": "webengine",
+
+    "commandline": {
+        "options": {
+            "proprietary-codecs": "boolean",
+            "spellchecker": "boolean"
+        }
+    },
+
+    "features": {
+        "proprietary-codecs": {
+            "label": "Proprietary Codecs",
+            "autoDetect": false,
+            "purpose": "Enables the use of proprietary codecs such as h.264/h.265 and MP3",
+            "output": [ "privateFeature" ]
+        },
+        "spellchecker": {
+            "label": "Spellchecker",
+            "purpose": "Enables the use of Chromium's spellchecker",
+            "output": [ "privateFeature" ]
+        }
+    },
+
+    "summary": [
+        {
+            "section": "Qt WebEngine",
+            "entries": [
+                "proprietary-codecs",
+                "spellchecker"
+            ]
+        }
+    ]
+}