diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:15:06 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:15:06 +0200 |
commit | 028bd20e41fc1995c34ca4c19e5342ff3efe0c6a (patch) | |
tree | 71aa1e77a262ba2d2a72dc6ac8f5c5c3a26567f2 /configure.json | |
parent | 4ea591e7efdb63c26372af4af9507c5f57b42fcc (diff) | |
parent | b24a6419869c14e32e87cb97e529cc25c246b5e0 (diff) |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: If450c073521057241f34ed9b9a7f9965c6752a15
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", |