diff options
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/configure.json b/configure.json index 62b56bbb1..805ed4001 100644 --- a/configure.json +++ b/configure.json @@ -4,13 +4,10 @@ "printsupport" ], - "testDir": "tools/qmake/config.tests", - "commandline": { "options": { "alsa": "boolean", "embedded": "boolean", - "optimize-for-size": { "type": "boolean", "name": "optimize_size" }, "ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, "opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } }, "webp": { "type": "enum", "name": "system-webp", "values": { "system": "yes", "qt": "no" } }, @@ -58,6 +55,11 @@ }, "tests" : { + "python2": { + "label": "Python 2", + "type": "detectPython2", + "log": "location" + }, "ninja": { "label": "system ninja", "type": "detectNinja" @@ -73,6 +75,13 @@ }, "features": { + "python2": { + "label": "Python 2", + "condition": "tests.python2", + "output": [ + { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.python2.location" } + ] + }, "embedded": { "label": "Embedded build", "condition": "config.unix", @@ -80,11 +89,6 @@ "purpose": "Enables the embedded build configuration", "output": [ "privateFeature" ] }, - "optimize_size": { - "label": "Optimize for size", - "autoDetect": "tests.embedded", - "output": [ "privateFeature" ] - }, "alsa": { "label": "ALSA", "condition": "config.unix && libs.alsa", @@ -157,12 +161,19 @@ } }, + "report": [ + { + "type": "warning", + "condition": "!features.python2", + "message": "Python version 2 (2.7.5 or later) is required to build QtWebEngine." + } + ], + "summary": [ { "section": "Qt WebEngine", "entries": [ "embedded", - "optimize_size", "pepper-plugins", "printing-and-pdf", "proprietary-codecs", |