From 75d700204b3e0a7d66327afbf28e1869a062e397 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 10 Nov 2016 14:11:57 +0100
Subject: Start using new config system
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds the optionproprietary codecs to configure.json, so it can be selected by
the global configure, and is summarized there too.

Keeps the old system for compat with building against older Qt.

Change-Id: I5deba10f2e25445870cbdc7507155b0b76c307de
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 configure.json | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 configure.json

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
new file mode 100644
index 000000000..f9fa17a8d
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,27 @@
+{
+    "module": "webengine",
+
+    "commandline": {
+        "options": {
+            "proprietary-codecs": "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" ]
+        }
+    },
+
+    "summary": [
+        {
+            "section": "Qt WebEngine",
+            "entries": [
+                "proprietary-codecs"
+            ]
+        }
+    ]
+}
-- 
cgit v1.2.3